diff --git a/Doc/TestPlan/TestPlan.lof b/Doc/TestPlan/TestPlan.lof
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Doc/TestPlan/TestPlan.lot b/Doc/TestPlan/TestPlan.lot
new file mode 100644
index 0000000000000000000000000000000000000000..91bf9d4b8e7fd3feee282a882308c70a03accae4
--- /dev/null
+++ b/Doc/TestPlan/TestPlan.lot
@@ -0,0 +1,3 @@
+\contentsline {table}{\numberline {1}{\ignorespaces \bf Revision History}}{ii}{table.1}
+\contentsline {table}{\numberline {2}{\ignorespaces \textbf {Table of Abbreviations}}}{1}{table.2}
+\contentsline {table}{\numberline {3}{\ignorespaces \textbf {Table of Definitions}}}{1}{table.3}
diff --git a/Doc/TestPlan/TestPlan.out b/Doc/TestPlan/TestPlan.out
new file mode 100644
index 0000000000000000000000000000000000000000..d7cd3346114071c7eb6c379ea26127db9ecd02e7
--- /dev/null
+++ b/Doc/TestPlan/TestPlan.out
@@ -0,0 +1,30 @@
+\BOOKMARK [1][-]{section.1}{General Information}{}% 1
+\BOOKMARK [2][-]{subsection.1.1}{Purpose}{section.1}% 2
+\BOOKMARK [2][-]{subsection.1.2}{Scope}{section.1}% 3
+\BOOKMARK [2][-]{subsection.1.3}{Acronyms, Abbreviations, and Symbols}{section.1}% 4
+\BOOKMARK [2][-]{subsection.1.4}{Overview of Document}{section.1}% 5
+\BOOKMARK [1][-]{section.2}{Plan}{}% 6
+\BOOKMARK [2][-]{subsection.2.1}{Software Description}{section.2}% 7
+\BOOKMARK [2][-]{subsection.2.2}{Test Team}{section.2}% 8
+\BOOKMARK [2][-]{subsection.2.3}{Automated Testing Approach}{section.2}% 9
+\BOOKMARK [2][-]{subsection.2.4}{Testing Tools}{section.2}% 10
+\BOOKMARK [2][-]{subsection.2.5}{Testing Schedule}{section.2}% 11
+\BOOKMARK [1][-]{section.3}{System Test Description}{}% 12
+\BOOKMARK [2][-]{subsection.3.1}{Tests for Functional Requirements}{section.3}% 13
+\BOOKMARK [3][-]{subsubsection.3.1.1}{Area of Testing1}{subsection.3.1}% 14
+\BOOKMARK [3][-]{subsubsection.3.1.2}{Area of Testing2}{subsection.3.1}% 15
+\BOOKMARK [2][-]{subsection.3.2}{Tests for Nonfunctional Requirements}{section.3}% 16
+\BOOKMARK [3][-]{subsubsection.3.2.1}{Area of Testing1}{subsection.3.2}% 17
+\BOOKMARK [3][-]{subsubsection.3.2.2}{Area of Testing2}{subsection.3.2}% 18
+\BOOKMARK [1][-]{section.4}{Tests for Proof of Concept}{}% 19
+\BOOKMARK [2][-]{subsection.4.1}{Opening a GIF file for playback}{section.4}% 20
+\BOOKMARK [2][-]{subsection.4.2}{Saving a GIF file's frames}{section.4}% 21
+\BOOKMARK [1][-]{section.5}{Comparison to Existing Implementation}{}% 22
+\BOOKMARK [2][-]{subsection.5.1}{Graphics/UI}{section.5}% 23
+\BOOKMARK [2][-]{subsection.5.2}{Performance}{section.5}% 24
+\BOOKMARK [1][-]{section.6}{Unit Testing Plan}{}% 25
+\BOOKMARK [2][-]{subsection.6.1}{Unit testing of internal functions}{section.6}% 26
+\BOOKMARK [2][-]{subsection.6.2}{Unit testing of output files}{section.6}% 27
+\BOOKMARK [1][-]{section.7}{Appendix}{}% 28
+\BOOKMARK [2][-]{subsection.7.1}{Symbolic Parameters}{section.7}% 29
+\BOOKMARK [2][-]{subsection.7.2}{Usability Survey Questions}{section.7}% 30
diff --git a/Doc/TestPlan/TestPlan.pdf b/Doc/TestPlan/TestPlan.pdf
index a1710219bf953c7c7886e8ff094d3161ce0dbf36..c0cb2c1ae2e8c8dd9a3fd5ababc9f09bcaaa0ad1 100644
Binary files a/Doc/TestPlan/TestPlan.pdf and b/Doc/TestPlan/TestPlan.pdf differ
diff --git a/Doc/TestPlan/TestPlan.tex b/Doc/TestPlan/TestPlan.tex
index 8b26b03b7a13b4717233c72ae7c21104261f033b..671223d7304a501a4421e0529de1672322e6e911 100644
--- a/Doc/TestPlan/TestPlan.tex
+++ b/Doc/TestPlan/TestPlan.tex
@@ -12,10 +12,10 @@
 }
 \usepackage[round]{natbib}
 
-\title{SE 3XA3: Test Plan\\Title of Project}
+\title{SE 3XA3: Test Plan\\Gifitti}
 
-\author{Team \#, Team Name
-		\\ Student 1 name and macid
+\author{Team \#2,Gifitti
+		\\ Nicolai Kozel kozeln
 		\\ Student 2 name and macid
 		\\ Student 3 name and macid
 }
@@ -48,7 +48,7 @@ Date 2 & 1.1 & Notes\\
 
 \pagenumbering{arabic}
 
-This document ...
+This document describes the test plan for the Gifitti application developed for 3XA3 at McMaster University.  
 
 \section{General Information}
 
@@ -182,44 +182,59 @@ How test will be performed:
 
 \section{Tests for Proof of Concept}
 
-\subsection{Area of Testing1}
+\subsection{Opening a GIF file for playback}
 		
-\paragraph{Title for Test}
+\paragraph{Open GIF}
 
 \begin{enumerate}
 
-\item{test-id1\\}
+\item{OpenGif-01\\}
 
-Type: Functional, Dynamic, Manual, Static etc.
+Type: Manual Functional 
 					
-Initial State: 
+Initial State: Program must be in normal state (form window is open and playback window is blank).
 					
-Input: 
+Input: File 
 					
-Output: 
-					
-How test will be performed: 
+Output: GIF is shown in playback window of the form. 
 					
-\item{test-id2\\}
+How test will be performed: Click open button, select a file of type .gif, and verify that the GIF loads and begins to playback within the form window. 				
 
-Type: Functional, Dynamic, Manual, Static etc.
-					
-Initial State: 
+\end{enumerate}
+
+\subsection{Saving a GIF file's frames}
+
+\paragraph{Save GIF}
+
+\begin{enumerate}
+
+\item{SaveGif-01\\}
+
+Type: Manual Functional 
+				
+Initial State: Program must be in playback state (form window is open and playback window is playing GIF).
 					
-Input: 
+Input: GIF File  
 					
-Output: 
+Output: GIF's frames are saved as .bmp in folder specified.  
 					
-How test will be performed: 
+How test will be performed: Click save frames button, select a folder, and verify that the GIF's frames are saved to the specified folder as .bmp.				
 
 \end{enumerate}
-
-\subsection{Area of Testing2}
-
-...
-
 	
 \section{Comparison to Existing Implementation}	
+\subsection{Graphics/UI}
+\begin{enumerate}
+\item GIF playback resolution is the same or better than Gif Viewer.
+\item Program has the same button scheme as Gif Viewer (Open button to open file, Extract Frames button to save frames).
+\item Program has a help menu available that is similiar to Gif Viewer, but is available at all times. 
+\item Program's color scheme and design resembles Gif Viewer.
+\end{enumerate}
+\subsection{Performance}
+\begin{enumerate}
+\item GIF playback is at the same smoothness/framerate or better than Gif Viewer.
+\item Opening and saving a file takes the same amount of time or less than Gif Viewer.
+\end{enumerate}
 				
 \section{Unit Testing Plan}
 		
@@ -235,15 +250,17 @@ How test will be performed:
 
 \section{Appendix}
 
-This is where you can place additional information.
-
+This section contains symbolic parameters for this document and the usability survey that will be delivered 
+to a focus group upon initial completion of the application. 
 \subsection{Symbolic Parameters}
 
 The definition of the test cases will call for SYMBOLIC\_CONSTANTS.
 Their values are defined in this section for easy maintenance.
 
-\subsection{Usability Survey Questions?}
-
-This is a section that would be appropriate for some teams.
+\subsection{Usability Survey Questions}
+The survey will be deliverered in the same format as the Questionaire for User Interface Satisfaction. This 
+questionaire is composed of various questions pertaining to several sub categories on a 0-9 scale. This includes the screen,
+terminology and system information, learning, and system capabilites. It also allows the user to list the most 
+positive and negative aspects of the program. The questionaire can be found at \href{http://garyperlman.com/quest/quest.cgi?form=QUIS}{garyperlman.com}
 
 \end{document}
\ No newline at end of file
diff --git a/Doc/TestPlan/TestPlan.toc b/Doc/TestPlan/TestPlan.toc
new file mode 100644
index 0000000000000000000000000000000000000000..7e250667aa559ea043248820e853b08e5e59bc0a
--- /dev/null
+++ b/Doc/TestPlan/TestPlan.toc
@@ -0,0 +1,34 @@
+\contentsline {section}{\numberline {1}General Information}{1}{section.1}
+\contentsline {subsection}{\numberline {1.1}Purpose}{1}{subsection.1.1}
+\contentsline {subsection}{\numberline {1.2}Scope}{1}{subsection.1.2}
+\contentsline {subsection}{\numberline {1.3}Acronyms, Abbreviations, and Symbols}{1}{subsection.1.3}
+\contentsline {subsection}{\numberline {1.4}Overview of Document}{2}{subsection.1.4}
+\contentsline {section}{\numberline {2}Plan}{2}{section.2}
+\contentsline {subsection}{\numberline {2.1}Software Description}{2}{subsection.2.1}
+\contentsline {subsection}{\numberline {2.2}Test Team}{2}{subsection.2.2}
+\contentsline {subsection}{\numberline {2.3}Automated Testing Approach}{2}{subsection.2.3}
+\contentsline {subsection}{\numberline {2.4}Testing Tools}{2}{subsection.2.4}
+\contentsline {subsection}{\numberline {2.5}Testing Schedule}{2}{subsection.2.5}
+\contentsline {section}{\numberline {3}System Test Description}{2}{section.3}
+\contentsline {subsection}{\numberline {3.1}Tests for Functional Requirements}{2}{subsection.3.1}
+\contentsline {subsubsection}{\numberline {3.1.1}Area of Testing1}{2}{subsubsection.3.1.1}
+\contentsline {paragraph}{Title for Test}{2}{section*.4}
+\contentsline {subsubsection}{\numberline {3.1.2}Area of Testing2}{3}{subsubsection.3.1.2}
+\contentsline {subsection}{\numberline {3.2}Tests for Nonfunctional Requirements}{3}{subsection.3.2}
+\contentsline {subsubsection}{\numberline {3.2.1}Area of Testing1}{3}{subsubsection.3.2.1}
+\contentsline {paragraph}{Title for Test}{3}{section*.5}
+\contentsline {subsubsection}{\numberline {3.2.2}Area of Testing2}{3}{subsubsection.3.2.2}
+\contentsline {section}{\numberline {4}Tests for Proof of Concept}{4}{section.4}
+\contentsline {subsection}{\numberline {4.1}Opening a GIF file for playback}{4}{subsection.4.1}
+\contentsline {paragraph}{Open GIF}{4}{section*.6}
+\contentsline {subsection}{\numberline {4.2}Saving a GIF file's frames}{4}{subsection.4.2}
+\contentsline {paragraph}{Save GIF}{4}{section*.7}
+\contentsline {section}{\numberline {5}Comparison to Existing Implementation}{5}{section.5}
+\contentsline {subsection}{\numberline {5.1}Graphics/UI}{5}{subsection.5.1}
+\contentsline {subsection}{\numberline {5.2}Performance}{5}{subsection.5.2}
+\contentsline {section}{\numberline {6}Unit Testing Plan}{5}{section.6}
+\contentsline {subsection}{\numberline {6.1}Unit testing of internal functions}{5}{subsection.6.1}
+\contentsline {subsection}{\numberline {6.2}Unit testing of output files}{5}{subsection.6.2}
+\contentsline {section}{\numberline {7}Appendix}{6}{section.7}
+\contentsline {subsection}{\numberline {7.1}Symbolic Parameters}{6}{subsection.7.1}
+\contentsline {subsection}{\numberline {7.2}Usability Survey Questions}{6}{subsection.7.2}