diff --git a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
index cc095e8..fe4b1c1 100644
--- a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
@@ -5,4 +5,6 @@
 Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.nebula.widgets.nattable.core;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.junit
+Require-Bundle: org.junit,
+ org.mockito.mockito-core;bundle-version="1.9.5",
+ com.springsource.org.objenesis;bundle-version="1.0.0"
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainterTest.xtend b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainterTest.xtend
new file mode 100644
index 0000000..0e3614a
--- /dev/null
+++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainterTest.xtend
@@ -0,0 +1,77 @@
+package org.eclipse.nebula.widgets.nattable.core.layer.impl
+
+import org.eclipse.nebula.widgets.nattable.core.geometry.PixelRectangle
+import org.eclipse.nebula.widgets.nattable.core.graphics.GraphicsContext
+import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.AxisImpl
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.runners.MockitoJUnitRunner
+
+import static org.junit.Assert.*
+import static org.mockito.Matchers.*
+
+import static extension org.eclipse.nebula.widgets.nattable.core.layer.LayerInvariants.*
+import static extension org.mockito.Mockito.*
+
+@RunWith(typeof(MockitoJUnitRunner))
+class CellLayerPainterTest {
+	
+	DummyLayer testLayer
+	@Mock GraphicsContext testGC
+	CellLayerPainter layerPainter
+	
+	@Before
+	def void before() {
+		//   100   100   100   100
+		// +-----+-----+-----+-----+
+		// | 0,0 | 1,0 | 2,0 | 3,0 | 20
+		// +-----+-----+-----+-----+
+		// | 0,1 | 1,1 | 2,1 | 3,1 | 20
+		// +-----+-----+-----+-----+
+		// | 0,2 | 1,2 | 2,2 | 3,2 | 20
+		// +-----+-----+-----+-----+
+		testLayer = spy(new DummyLayer(
+			new AxisImpl(4, 100),
+			new AxisImpl(3, 20)
+		))
+		layerPainter = new CellLayerPainter
+	}
+	
+	@Test
+	def void baseline() {
+		assertEquals(4, testLayer.columnCount)
+		assertEquals(3, testLayer.rowCount)
+	}
+	
+	@Test
+	def void paintEverything() {
+		val clipBounds = testLayer.pixelBounds
+		when(testGC.clipBounds).thenReturn(clipBounds)
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testLayer, 12.times).getCell(anyInt, anyInt)
+	}
+	
+	@Test
+	def void clipBoundsLargerThanLayer() {
+		when(testGC.clipBounds).thenReturn(new PixelRectangle(0, 0, 500, 100))
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testLayer, 12.times).getCell(anyInt, anyInt)
+	}
+	
+	@Test
+	def void paintSome_aligned() {
+		when(testGC.clipBounds).thenReturn(new PixelRectangle(100, 20, 200, 20))
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testLayer, 2.times).getCell(anyInt, anyInt)
+	}
+	
+	@Test
+	def void paintSome_unaligned() {
+		when(testGC.clipBounds).thenReturn(new PixelRectangle(50, 22, 200, 20))
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testLayer, 6.times).getCell(anyInt, anyInt)
+	}
+	
+}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/GridLineCellLayerPainterTest.xtend b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/GridLineCellLayerPainterTest.xtend
new file mode 100644
index 0000000..3448789
--- /dev/null
+++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/GridLineCellLayerPainterTest.xtend
@@ -0,0 +1,70 @@
+package org.eclipse.nebula.widgets.nattable.core.layer.impl
+
+import org.eclipse.nebula.widgets.nattable.core.geometry.PixelRectangle
+import org.eclipse.nebula.widgets.nattable.core.graphics.GraphicsContext
+import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.AxisImpl
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.runners.MockitoJUnitRunner
+
+import static org.mockito.Matchers.*
+
+import static extension org.eclipse.nebula.widgets.nattable.core.layer.LayerInvariants.*
+import static extension org.mockito.Mockito.*
+
+@RunWith(typeof(MockitoJUnitRunner))
+class GridLineCellLayerPainterTest {
+
+	DummyLayer testLayer
+	@Mock GraphicsContext testGC
+	GridLineCellLayerPainter layerPainter
+	
+	@Before
+	def void before() {
+		//   100   100   100   100
+		// +-----+-----+-----+-----+
+		// | 0,0 | 1,0 | 2,0 | 3,0 | 20
+		// +-----+-----+-----+-----+
+		// | 0,1 | 1,1 | 2,1 | 3,1 | 20
+		// +-----+-----+-----+-----+
+		// | 0,2 | 1,2 | 2,2 | 3,2 | 20
+		// +-----+-----+-----+-----+
+		testLayer = spy(new DummyLayer(
+			new AxisImpl(4, 100),
+			new AxisImpl(3, 20)
+		))
+		layerPainter = new GridLineCellLayerPainter
+	}
+	
+	@Test
+	def void paintEverything() {
+		val clipBounds = testLayer.pixelBounds
+		when(testGC.clipBounds).thenReturn(clipBounds)
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testGC, 7.times).drawLine(anyInt, anyInt, anyInt, anyInt)
+	}
+	
+	@Test
+	def void clipBoundsLargerThanLayer() {
+		when(testGC.clipBounds).thenReturn(new PixelRectangle(0, 0, 500, 100))
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testGC, 7.times).drawLine(anyInt, anyInt, anyInt, anyInt)
+	}
+	
+	@Test
+	def void paintSome_aligned() {
+		when(testGC.clipBounds).thenReturn(new PixelRectangle(100, 20, 200, 20))
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testGC, 3.times).drawLine(anyInt, anyInt, anyInt, anyInt)
+	}
+	
+	@Test
+	def void paintSome_unaligned() {
+		when(testGC.clipBounds).thenReturn(new PixelRectangle(50, 22, 200, 20))
+		layerPainter.paintLayer(testLayer, testLayer.pixelBounds, testGC)
+		verify(testGC, 3.times).drawLine(anyInt, anyInt, anyInt, anyInt)
+	}
+	
+}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend
index 7acba78..075263c 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend
@@ -1,6 +1,7 @@
 package org.eclipse.nebula.widgets.nattable.core.layer
 
 import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.AxisInvariants.*
+import org.eclipse.nebula.widgets.nattable.core.geometry.PixelRectangle
 
 /**
  * A set of useful utility functions that calculate invariants that must hold for any Layer.
@@ -69,4 +70,13 @@
 		layer.horizontalAxis.containsPixelLocation(xPixel) && layer.verticalAxis.containsPixelLocation(yPixel)
 	}
 	
+	def static PixelRectangle getPixelBounds(Layer layer) {
+		new PixelRectangle(
+			layer.getStartXPixelOfColumnPosition(0),
+			layer.getStartYPixelOfRowPosition(0),
+			layer.pixelWidth,
+			layer.pixelHeight
+		)
+	}
+	
 }
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend
index 168d2f9..105b0b2 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend
@@ -5,20 +5,20 @@
  */
 class AxisInvariants {
 	
-	def static getPixelSize(Axis axis) {
+	static def getPixelSize(Axis axis) {
 		axis.getStartPixelOfSegmentPosition(axis.segmentCount) - axis.getStartPixelOfSegmentPosition(0)
 	}
 	
-	def static getPixelSizeOfSegmentPosition(Axis axis, int segmentPosition) {
+	static def getPixelSizeOfSegmentPosition(Axis axis, int segmentPosition) {
 		axis.getStartPixelOfSegmentPosition(segmentPosition + 1) - axis.getStartPixelOfSegmentPosition(segmentPosition)
 	}
 	
-	def static boolean containsPixelLocation(Axis axis, int pixelLocation) {
+	static def boolean containsPixelLocation(Axis axis, int pixelLocation) {
 		pixelLocation >= 0 && pixelLocation < axis.getStartPixelOfSegmentPosition(axis.segmentCount)
 	}
 	
-	def static boolean containsSegmentPosition(Axis axis, int segmentPosition) {
+	static def boolean containsSegmentPosition(Axis axis, int segmentPosition) {
 		segmentPosition >= 0 && segmentPosition < axis.segmentCount
 	}
-	
+
 }
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend
index c5fea48..f05d3d0 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend
@@ -20,8 +20,15 @@
 	override paintLayer(Layer layer, PixelRectangle paintBounds, GraphicsContext gc) {
 //		gc.clearRect(0, 0, canvas.boundsInLocal.width, canvas.boundsInLocal.height)
 
-		for (columnPosition : 0 ..< layer.getColumnCount)
-			for (rowPosition : 0 ..< layer.getRowCount) {
+		val clipBounds = gc.clipBounds
+		
+		val fromColumnPosition = Math::max(layer.getColumnPositionOfXPixel(clipBounds.x), 0)
+		val toColumnPosition = Math::min(layer.getColumnPositionOfXPixel(clipBounds.x + clipBounds.width - 1), layer.columnCount - 1)
+		val fromRowPosition = Math::max(layer.getRowPositionOfYPixel(clipBounds.y), 0)
+		val toRowPosition = Math::min(layer.getRowPositionOfYPixel(clipBounds.y + clipBounds.height - 1), layer.rowCount - 1)
+		
+		for (columnPosition : fromColumnPosition .. toColumnPosition)
+			for (rowPosition : fromRowPosition .. toRowPosition) {
 				val cell = layer.getCell(columnPosition, rowPosition)
 				
 				gc.pushState
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/GridLineCellLayerPainter.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/GridLineCellLayerPainter.xtend
index bf4b5c0..c03f8a4 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/GridLineCellLayerPainter.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/GridLineCellLayerPainter.xtend
@@ -44,17 +44,23 @@
 		val pixelWidth = layer.getPixelWidth
 		val pixelHeight = layer.getPixelHeight
 		
+		val clipBounds = gc.clipBounds
+		
 		// Draw horizontal grid lines
-		for (rowPosition : 1 .. layer.getRowCount) {
+		val fromRowPosition = Math::max(layer.getRowPositionOfYPixel(clipBounds.y) + 1, 1)
+		val toRowPosition = Math::min(layer.getRowPositionOfYPixel(clipBounds.y + clipBounds.height), layer.rowCount)
+		for (rowPosition : fromRowPosition .. toRowPosition) {
 			val startY = layer.getStartYPixelOfRowPosition(rowPosition) - 1
 			gc.drawLine(
 				0,          startY,
 				pixelWidth, startY
 			)
 		}
-			
+		
 		// Draw vertical grid lines
-		for (columnPosition : 1 .. layer.getColumnCount) {
+		val fromColumnPosition = Math::max(layer.getColumnPositionOfXPixel(clipBounds.x) + 1, 1)
+		val toColumnPosition = Math::min(layer.getColumnPositionOfXPixel(clipBounds.x + clipBounds.width), layer.columnCount)
+		for (columnPosition : fromColumnPosition .. toColumnPosition) {
 			val startX = layer.getStartXPixelOfColumnPosition(columnPosition) - 1
 			gc.drawLine(
 				startX, 0,
diff --git a/target-platform/dependencies/plugins/asm-license.txt b/target-platform/dependencies/plugins/asm-license.txt
new file mode 100644
index 0000000..fe0bf7d
--- /dev/null
+++ b/target-platform/dependencies/plugins/asm-license.txt
@@ -0,0 +1,29 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/target-platform/dependencies/plugins/cglib-license.txt b/target-platform/dependencies/plugins/cglib-license.txt
new file mode 100644
index 0000000..f49a4e1
--- /dev/null
+++ b/target-platform/dependencies/plugins/cglib-license.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/target-platform/dependencies/plugins/com.springsource.org.hamcrest.core-1.1.0.jar b/target-platform/dependencies/plugins/com.springsource.org.hamcrest.core-1.1.0.jar
new file mode 100644
index 0000000..5b2b484
--- /dev/null
+++ b/target-platform/dependencies/plugins/com.springsource.org.hamcrest.core-1.1.0.jar
Binary files differ
diff --git a/target-platform/dependencies/plugins/com.springsource.org.objenesis-1.0.0.jar b/target-platform/dependencies/plugins/com.springsource.org.objenesis-1.0.0.jar
new file mode 100644
index 0000000..1f1b76d
--- /dev/null
+++ b/target-platform/dependencies/plugins/com.springsource.org.objenesis-1.0.0.jar
Binary files differ
diff --git a/target-platform/dependencies/plugins/hamcrest-license.txt b/target-platform/dependencies/plugins/hamcrest-license.txt
new file mode 100644
index 0000000..e3d4feb
--- /dev/null
+++ b/target-platform/dependencies/plugins/hamcrest-license.txt
@@ -0,0 +1,27 @@
+BSD License
+
+Copyright (c) 2000-2006, www.hamcrest.org
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer. Redistributions in binary form must reproduce
+the above copyright notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of Hamcrest nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
\ No newline at end of file
diff --git a/target-platform/dependencies/plugins/mockito-core-1.9.5.jar b/target-platform/dependencies/plugins/mockito-core-1.9.5.jar
new file mode 100644
index 0000000..df91508
--- /dev/null
+++ b/target-platform/dependencies/plugins/mockito-core-1.9.5.jar
Binary files differ
diff --git a/target-platform/dependencies/plugins/objenesis-license.txt b/target-platform/dependencies/plugins/objenesis-license.txt
new file mode 100644
index 0000000..74582ac
--- /dev/null
+++ b/target-platform/dependencies/plugins/objenesis-license.txt
@@ -0,0 +1,18 @@
+Copyright (c) 2003-2008, Objenesis Team and all contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target
index 5ea4b48..5eabe81 100644
--- a/target-platform/target-platform.target
+++ b/target-platform/target-platform.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="NatTable Target" sequenceNumber="8">
+<?pde version="3.8"?><target name="NatTable Target" sequenceNumber="9">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 <unit id="org.apache.poi" version="3.9.0.v201303080712"/>
@@ -16,5 +16,6 @@
 <unit id="org.eclipse.xtend.sdk.feature.group" version="2.4.1.v201304180855"/>
 <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/"/>
 </location>
+<location path="${project_loc:target-platform}/dependencies" type="Directory"/>
 </locations>
 </target>