diff --git a/include/Timeline.h b/include/Timeline.h
index cda127b3..2b3ce921 100644
--- a/include/Timeline.h
+++ b/include/Timeline.h
@@ -7,6 +7,8 @@
  * \author Copyright (c) 2011 Jonathan Thomas
  */
 
+#include "FileReaderBase.h"
+#include "Frame.h"
 #include "KeyFrame.h"
 
 using namespace std;
@@ -22,21 +24,38 @@ namespace openshot {
 	 * video output will be rendered.  It has a collection of layers and clips, that arrange,
 	 * sequence, and generate the final video output.
 	 */
-	class Timeline {
+	class Timeline : public FileReaderBase {
 	private:
-		int canvas_width; ///<Width of the canvas
-		int canvas_height; ///<Height of the canvas
-
-		Keyframe viewport_scale; ///<Curve representing the scale of the viewport (0 to 100)
-		Keyframe viewport_x; ///<Curve representing the x coordinate for the viewport
-		Keyframe viewport_y; ///<Curve representing the y coordinate for the viewport
+		int width; ///<Width of the canvas
+		int height; ///<Height of the canvas
 
 	public:
 
 		/// Default Constructor for the timeline (which sets the canvas width and height)
 		Timeline(int width, int height);
 
+		/// Get an openshot::Frame object for a specific frame number of this timeline.
+		///
+		/// @returns The requested frame (containing the image)
+		/// @param[requested_frame] number The frame number that is requested.
+		Frame* GetFrame(int requested_frame);
 
+		/// Get the width of canvas and viewport
+		int Width() { return width; }
+
+		/// Get the height of canvas and viewport
+		int Height() { return height; }
+
+		/// Set the width of canvas and viewport
+		void Width(int new_width) { width = new_width; }
+
+		/// Set the height of canvas and viewport
+		void Height(int new_height) { height = new_height; }
+
+		// Curves for the viewport
+		Keyframe viewport_scale; ///<Curve representing the scale of the viewport (0 to 100)
+		Keyframe viewport_x; ///<Curve representing the x coordinate for the viewport
+		Keyframe viewport_y; ///<Curve representing the y coordinate for the viewport
 	};
 
 
diff --git a/src/Main.cpp b/src/Main.cpp
index d11df66b..73d12cd8 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -15,11 +15,13 @@ void FrameReady(int number)
 int main()
 {
 	// Create a clip
-	Clip c("/home/jonathan/Pictures/afriscot_megaman.png");
+	Clip c("/home/jonathan/Videos/big-buck-bunny_trailer.webm");
 	cout << "Position: " << c.Position() << endl;
 	cout << "Start: " << c.Start() << endl;
 	cout << "End: " << c.End() << endl;
 
+	return 0;
+
 	//openshot::ImageReader i("/home/jonathan/Apps/videcho_site/media/logos/watermark3.png");
 	//openshot::Frame* overlay = i.GetFrame(1);
 	//i.DisplayInfo();
diff --git a/src/Timeline.cpp b/src/Timeline.cpp
index be3d185d..e181cd21 100644
--- a/src/Timeline.cpp
+++ b/src/Timeline.cpp
@@ -3,15 +3,17 @@
 using namespace openshot;
 
 // Default Constructor for the timeline (which sets the canvas width and height)
-Timeline::Timeline(int width, int height)
+Timeline::Timeline(int width, int height) :
+		width(width), height(height)
 {
-	// Init canvas size
-	canvas_width = width;
-	canvas_height = height;
-
 	// Init viewport size (curve based, because it can be animated)
 	viewport_scale = Keyframe(100.0);
 	viewport_x = Keyframe(0.0);
 	viewport_y = Keyframe(0.0);
+}
+
+// Get an openshot::Frame object for a specific frame number of this reader.
+Frame* Timeline::GetFrame(int requested_frame)
+{
 
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 69b3a50d..736b49ce 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,6 +38,7 @@ include_directories(${SDL_INCLUDE_DIR})
 add_executable(tester
 			   tests.cpp
 			   Cache_Tests.cpp
+			   Clip_Tests.cpp
 			   Coordinate_Tests.cpp
 			   FileReaderBase_Tests.cpp
 			   FFmpegReader_Tests.cpp
@@ -45,7 +46,8 @@ add_executable(tester
 			   FrameMapper_Tests.cpp
 			   FrameRate_Tests.cpp
 			   KeyFrame_Tests.cpp
-			   Point_Tests.cpp)
+			   Point_Tests.cpp
+			   Timeline_Tests.cpp)
 
 # Link libraries to the new executable
 target_link_libraries(tester openshot ${UNITTEST++_LIBRARY})
diff --git a/tests/Clip_Tests.cpp b/tests/Clip_Tests.cpp
new file mode 100644
index 00000000..03bb770d
--- /dev/null
+++ b/tests/Clip_Tests.cpp
@@ -0,0 +1,61 @@
+#include "UnitTest++.h"
+#include "../include/OpenShot.h"
+
+using namespace std;
+using namespace openshot;
+
+TEST(Clip_Default_Constructor)
+{
+	// Create a empty clip
+	Clip c1;
+
+	// Check basic settings
+	CHECK_EQUAL(ANCHOR_CANVAS, c1.anchor);
+	CHECK_EQUAL(GRAVITY_CENTER, c1.gravity);
+	CHECK_EQUAL(SCALE_FIT, c1.scale);
+	CHECK_EQUAL(0, c1.Layer());
+	CHECK_CLOSE(0.0f, c1.Position(), 0.00001);
+	CHECK_CLOSE(0.0f, c1.Start(), 0.00001);
+	CHECK_CLOSE(0.0f, c1.End(), 0.00001);
+}
+
+TEST(Clip_Constructor)
+{
+	// Create a empty clip
+	Clip c1("../../src/examples/piano.wav");
+
+	// Check basic settings
+	CHECK_EQUAL(ANCHOR_CANVAS, c1.anchor);
+	CHECK_EQUAL(GRAVITY_CENTER, c1.gravity);
+	CHECK_EQUAL(SCALE_FIT, c1.scale);
+	CHECK_EQUAL(0, c1.Layer());
+	CHECK_CLOSE(0.0f, c1.Position(), 0.00001);
+	CHECK_CLOSE(0.0f, c1.Start(), 0.00001);
+	CHECK_CLOSE(4.39937f, c1.End(), 0.00001);
+}
+
+TEST(Clip_Basic_Gettings_and_Setters)
+{
+	// Create a empty clip
+	Clip c1;
+
+	// Check basic settings
+	CHECK_EQUAL(ANCHOR_CANVAS, c1.anchor);
+	CHECK_EQUAL(GRAVITY_CENTER, c1.gravity);
+	CHECK_EQUAL(SCALE_FIT, c1.scale);
+	CHECK_EQUAL(0, c1.Layer());
+	CHECK_CLOSE(0.0f, c1.Position(), 0.00001);
+	CHECK_CLOSE(0.0f, c1.Start(), 0.00001);
+	CHECK_CLOSE(0.0f, c1.End(), 0.00001);
+
+	// Change some properties
+	c1.Layer(1);
+	c1.Position(5.0);
+	c1.Start(3.5);
+	c1.End(10.5);
+
+	CHECK_EQUAL(1, c1.Layer());
+	CHECK_CLOSE(5.0f, c1.Position(), 0.00001);
+	CHECK_CLOSE(3.5f, c1.Start(), 0.00001);
+	CHECK_CLOSE(10.5f, c1.End(), 0.00001);
+}
diff --git a/tests/Timeline_Tests.cpp b/tests/Timeline_Tests.cpp
new file mode 100644
index 00000000..17813d32
--- /dev/null
+++ b/tests/Timeline_Tests.cpp
@@ -0,0 +1,46 @@
+#include "UnitTest++.h"
+#include "../include/OpenShot.h"
+
+using namespace std;
+using namespace openshot;
+
+TEST(Timeline_Constructor)
+{
+	// Create a default fraction (should be 1/1)
+	Timeline t1(640, 480);
+
+	// Check values
+	CHECK_EQUAL(640, t1.Width());
+	CHECK_EQUAL(480, t1.Height());
+
+	// Create a default fraction (should be 1/1)
+	Timeline t2(300, 240);
+
+	// Check values
+	CHECK_EQUAL(300, t2.Width());
+	CHECK_EQUAL(240, t2.Height());
+}
+
+TEST(Timeline_Width_and_Height_Functions)
+{
+	// Create a default fraction (should be 1/1)
+	Timeline t1(640, 480);
+
+	// Check values
+	CHECK_EQUAL(640, t1.Width());
+	CHECK_EQUAL(480, t1.Height());
+
+	// Set width
+	t1.Width(600);
+
+	// Check values
+	CHECK_EQUAL(600, t1.Width());
+	CHECK_EQUAL(480, t1.Height());
+
+	// Set height
+	t1.Height(400);
+
+	// Check values
+	CHECK_EQUAL(600, t1.Width());
+	CHECK_EQUAL(400, t1.Height());
+}