diff --git a/report/8_Conclusions.tex b/report/8_Conclusions.tex
new file mode 100644
index 0000000000000000000000000000000000000000..b2c59b2a72b55d0d39ac9dd152aac7bdfe58c241
--- /dev/null
+++ b/report/8_Conclusions.tex
@@ -0,0 +1,147 @@
+%% ----------------------------------------------------------------
+%% 9_Conclusions.tex
+%% ----------------------------------------------------------------
+\chapter{CONCLUSION} \label{Chapter: Conclusions}
+
+This project aimed to enable SMEs to create and customise their own compliance forms in order to stay up to date with the latest cyber security standards, as well as ensure that their partner organisations and other organisations in their supply chain are keeping to those same standards. CompForge has lowered the time and cost required to perform these tasks, with a user friendly UI and real time updates from the application's Firestore database.
+
+\section{Project Management}
+ Some of the first parts of the project actually progressed ahead of schedule, such as the initial Gantt chart. Until the handin for the progress report in December, the project was progressing on schedule. Understandably, the implementation, testing and final report write up were severly impacted by the university closure from the 23rd March onwards, due to the spread of COVID-19. This, coupled with delays during the implementation caused by an underestimation of the learning curve of the technologies that were used, resulted in much of the remainder of the project being completed behind schedule.
+
+ \subsection{Gantt Chart}
+
+ The initial Gantt chart is represented by the cells in blue, with the aforementioned delays to the project represented in orange. Major components are represented in a darker shade of each colour, with each subcomponent represented by respective lighter shades. For readability, it has been split over two pages.
+
+ \begin{sidewaystable}[h]
+ \centering
+ \begin{tabular}{|c|c|c|c|c|c|c|c|c|c|}
+ \hline
+ Component & Subcomponent & October & November & December & January & February & March & April & May\\
+ \hline
+ \hline
+ Project Brief & & \cellcolor{RoyalBlue} & & & & & & & \\
+ \hline
+ & Background Research & \cellcolor{Cyan} & & & & & & & \\
+ \hline
+ & Write up & \cellcolor{Cyan} & & & & & & & \\
+ \hline
+ \hline
+ \makecell{Time Management\\Planning} & & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & & & & & \\
+ \hline
+ & Gantt Chart & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Cyan} & & & & & \\
+ \hline
+ \hline
+ Research & & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & & & & & \\
+ \hline
+ & \makecell{Further\\background research} & \cellcolor{Cyan} & \cellcolor{Cyan} & & & & & & \\
+ \hline
+ & Literature review & & \cellcolor{Cyan} & \cellcolor{Cyan} & & & & & \\
+ \hline
+ \hline
+ Design & & & \cellcolor{RoyalBlue} & & & & & & \\
+ \hline
+ & Planning diagrams & & \cellcolor{Cyan} & & & & & & \\
+ \hline
+ \hline
+ Progress Report & & & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & & & & & \\
+ \hline
+ & Write up & & \cellcolor{Cyan} & \cellcolor{Cyan} & & & & & \\
+ \hline
+ \hline
+ Implementation & & & & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{BurntOrange} & & \\
+ \hline
+ & Sign up & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & & & \\
+ \hline
+ & Sign in & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & & & \\
+ \hline
+ & Sign out & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & & & \\
+ \hline
+ & Create form & & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & & \\
+ \hline
+ & Delete form & & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & & \\
+ \hline
+ & View form & & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & & \\
+ \hline
+ & Share form & & & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & \\
+ \hline
+ & Submit form & & & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & \\
+ \hline
+ & View submissions & & & & & \cellcolor{Cyan} & \cellcolor{Apricot} & & \\
+ \hline
+ \end{tabular}
+ \caption{Gantt Chart}
+ \end{sidewaystable}
+
+ \pagebreak
+
+ \begin{sidewaystable}[h]
+ \centering
+ \begin{tabular}{|c|c|c|c|c|c|c|c|c|c|}
+ \hline
+ Component & Subcomponent & October & November & December & January & February & March & April & May\\
+ \hline
+ \hline
+ \makecell{Testing and\\Validation} & & & & & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{BurntOrange} & \cellcolor{BurntOrange} & \\
+ \hline
+ & Robot Framework setup & & & & \cellcolor{Cyan} & \cellcolor{Apricot} & \cellcolor{Apricot} & \cellcolor{Apricot} & \\
+ \hline
+ & Test Implementation & & & & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Apricot} & \cellcolor{Apricot} & \\
+ \hline
+ Final Report & & & & & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{RoyalBlue} & \cellcolor{BurntOrange}\\
+ \hline
+ & Introduction & & & \cellcolor{Cyan} & & & & & \\
+ \hline
+ & \makecell{Background and\\Literature Review} & & & \cellcolor{Cyan} & & & & & \\
+ \hline
+ & Designs & & & \cellcolor{Cyan} & & & & & \\
+ \hline
+ & Implementation & & & & & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Apricot} & \\
+ \hline
+ & Testing and software validation & & & & & & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Apricot} \\
+ \hline
+ & Results and Analysis & & & & & & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Apricot} \\
+ \hline
+ & Evaluation & & & & & & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Apricot}\\
+ \hline
+ & Project management & & & & & & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Apricot}\\
+ \hline
+ & Conclusions & & & & & & \cellcolor{Cyan} & \cellcolor{Cyan} & \cellcolor{Apricot}\\
+ \hline
+ & Future work & & & & & & & \cellcolor{Cyan} & \cellcolor{Apricot}\\
+ \hline
+ & Bibliography & & & & & & & \cellcolor{Cyan} & \cellcolor{Apricot}\\
+ \hline
+ & Appendices & & & & & & & \cellcolor{Cyan} & \cellcolor{Apricot}\\
+ \hline
+ \hline
+ \makecell{\st{Project Viva}\\(cancelled)} & - & - & - & - & - & - & - & \cellcolor{RoyalBlue} - & - \\
+ \hline
+ - & \st{Viva} & - & - & - & - & - & - & \cellcolor{Cyan} - & - \\
+ \hline
+ \end{tabular}
+ \caption{Gantt Chart cont.}
+ \end{sidewaystable}
+
+
+ \subsection{Issues}
+ As previously mentioned, there were problems during the implementation due to a lack of previous experience working with the technologies that were employed for development of the application. This had a knock on effect, pushing back the integration and implementation of the automated test suite, and writing of the report.
+
+\section{Improvements}
+ After evaluating the application and comparing it to competitors, a number of improvements that could be made have come to mind.
+
+ The ability to edit forms that have already been created, would be a useful tool in case a mistake is found, or an update is required. This is to be expected in the continuously growing field of cyber security, as doubtless many of the standards that are active today will change with time as technology continues to move forward along with the threats.
+
+ On the same vein, it would be useful to add the ability to share a form with new partners after it has been created. Organisations change and grow, and it could be necessary to share a form with additional organisations.
+
+ To save time, another useful feature would be the ability to add partners in a similar way to adding a friend on a social media platform. There would be no need to look up email addresses every time you needed to share a new form with an existing partner.
+
+ Finally, the number of forms you can create and share is technically infinite, so a search bar and sorting filter would both be useful additions to the application.
+
+\section{Future Work}
+ Further to the above improvements, there are some more major improvements that could be made with future work.
+
+ Specifically, a feature that allows a user to export form templates and specific submissions from partners to a particular format. Users may wish to print another user's submission to their form or share a form template with another user.
+
+ Conversely, the ability to import existing form templates would allow users to share popular standards such as; ISO/IEC 27001, Cloud Controls Matrix, the Cyber Essentials Scheme, or its progeny, IASME.
+
+ Finally, the use of email notifications to notify users when a form has been shared with them, or when a partner has made a submission would be convenient, as it is unlikely a user will have the application open at all times.
\ No newline at end of file
diff --git a/report/8_ProjectManagement.tex b/report/8_ProjectManagement.tex
deleted file mode 100644
index 5c88207c5746bfa71f5e349906b963d1fd15ce1d..0000000000000000000000000000000000000000
--- a/report/8_ProjectManagement.tex
+++ /dev/null
@@ -1,119 +0,0 @@
-%% ----------------------------------------------------------------
-%% 8_ProjectManagement.tex
-%% ----------------------------------------------------------------
-\chapter{PROJECT MANAGEMENT}
-
-\section{Initial Schedule}
-
- \subsection{Gantt Chart}
-
- \begin{sidewaystable}[h]
- \centering
- \begin{tabular}{|c|c|c|c|c|c|c|c|c|}
- \hline
- & & October & November & December & January & February & March & April\\
- \hline
- \hline
- Project Brief & & \cellcolor{gray} & & & & & & \\
- \hline
- & Background Research & \cellcolor{lightgray} & & & & & & \\
- \hline
- & Write up & \cellcolor{lightgray} & & & & & & \\
- \hline
- \hline
- Time Management Planning & & \cellcolor{gray} & \cellcolor{gray} & \cellcolor{gray} & & & & \\
- \hline
- & Final Gantt Chart & \cellcolor{lightgray} & \cellcolor{lightgray} & \cellcolor{lightgray} & & & & \\
- \hline
- \hline
- Research & & \cellcolor{gray} & \cellcolor{gray} & \cellcolor{gray} & & & & \\
- \hline
- & Further background research & \cellcolor{lightgray} & \cellcolor{lightgray} & & & & & \\
- \hline
- & Literature review & & \cellcolor{lightgray} & \cellcolor{lightgray} & & & & \\
- \hline
- \hline
- Design & & & \cellcolor{gray} & & & & & \\
- \hline
- & Planning diagrams & & \cellcolor{lightgray} & & & & & \\
- \hline
- \hline
- Progress Report & & & \cellcolor{gray} & \cellcolor{gray} & & & & \\
- \hline
- & Write up & & \cellcolor{lightgray} & \cellcolor{lightgray} & & & & \\
- \hline
- \hline
- Implementation & & & & \cellcolor{gray} & \cellcolor{gray} & \cellcolor{gray} & & \\
- \hline
- & Account creation (Register) & & & \cellcolor{lightgray} & & & & \\
- \hline
- & Sign in & & & \cellcolor{lightgray} & & & & \\
- \hline
- & Add a partner & & & \cellcolor{lightgray} & \cellcolor{lightgray} & & & \\
- \hline
- & Create a form & & & & \cellcolor{lightgray} & & & \\
- \hline
- & Share a form & & & & \cellcolor{lightgray} & & & \\
- \hline
- & Sign out & & & & \cellcolor{lightgray} & \cellcolor{lightgray} & & \\
- \hline
- & Notifications & & & & & \cellcolor{lightgray} & & \\
- \hline
- \end{tabular}
- \caption{Gantt Chart}
- \end{sidewaystable}
-
- \pagebreak
-
- \begin{sidewaystable}[h]
- \centering
- \begin{tabular}{|c|c|c|c|c|c|c|c|c|}
- \hline
- & & October & November & December & January & February & March & April\\
- \hline
- \hline
- Testing and Validation & & & & & \cellcolor{gray} & \cellcolor{gray} & & \\
- \hline
- & Robot Framework setup & & & & \cellcolor{lightgray} & & & \\
- \hline
- & Test Implementation & & & & \cellcolor{lightgray} & \cellcolor{lightgray} & & \\
- \hline
- Final Report & & & & & \cellcolor{gray} & \cellcolor{gray} & \cellcolor{gray} & \cellcolor{gray}\\
- \hline
- & Introduction & & & & \cellcolor{lightgray} & & & \\
- \hline
- & Background and Literature Review & & & & \cellcolor{lightgray} & & & \\
- \hline
- & Designs & & & & \cellcolor{lightgray} & & & \\
- \hline
- & Implementation & & & & \cellcolor{lightgray} & \cellcolor{lightgray} & & \\
- \hline
- & Testing and software validation & & & & & \cellcolor{lightgray} & \cellcolor{lightgray} & \\
- \hline
- & Results and Analysis & & & & & \cellcolor{lightgray} & \cellcolor{lightgray} & \\
- \hline
- & Evaluation & & & & & & \cellcolor{lightgray} & \cellcolor{lightgray}\\
- \hline
- & Project management & & & & & & \cellcolor{lightgray} & \cellcolor{lightgray}\\
- \hline
- & Conclusions & & & & & & \cellcolor{lightgray} & \cellcolor{lightgray}\\
- \hline
- & Future work & & & & & & & \cellcolor{lightgray}\\
- \hline
- & Bibliography & & & & & & & \cellcolor{lightgray}\\
- \hline
- & Appendices & & & & & & & \cellcolor{lightgray}\\
- \hline
- \hline
- Project Viva & & & & & & & & \cellcolor{gray}\\
- \hline
- & Viva & & & & & & & \cellcolor{lightgray}\\
- \hline
- \end{tabular}
- \caption{Gantt Chart cont.}
- \end{sidewaystable}
-
-
-\section{Problems/Obstacles}
-
-\section{Actual Performance}
\ No newline at end of file
diff --git a/report/9_Conclusions.tex b/report/9_Conclusions.tex
deleted file mode 100644
index ddbfd79edb0a64e6f6d6ade80147f46aed954f2b..0000000000000000000000000000000000000000
--- a/report/9_Conclusions.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-%% ----------------------------------------------------------------
-%% 9_Conclusions.tex
-%% ----------------------------------------------------------------
-\chapter{CONCLUSION} \label{Chapter: Conclusions}
-
-\section{Potential Improvements}
-
-\section{Future Work}
diff --git a/report/master.pdf b/report/master.pdf
index 46ab73b08cca15750cb10bd40c0615a2d3e036cd..f86aa54313c042f420ba489363db1ad19161bb64 100644
Binary files a/report/master.pdf and b/report/master.pdf differ
diff --git a/report/master.tex b/report/master.tex
index 31e1e7d091ca8e0320acff0a1598801cae3f44da..29f5c4b00f4d40a3562ff281a375444af71032db 100644
--- a/report/master.tex
+++ b/report/master.tex
@@ -48,8 +48,7 @@
\include{5_Implementation}
\include{6_TestingAndSoftwareValidation}
\include{7_Evaluation}
-\include{8_ProjectManagement}
-\include{9_Conclusions}
+\include{8_Conclusions}
% \backmatter means that we've gone from 1,2,3,4,5 chapter numbering
% to unnumbered bibliography/appendices.
diff --git a/report/src/ecsgdp.cls b/report/src/ecsgdp.cls
index 6949824d2c950db26009f2765bed1366b68b689a..d39bff2cb6b522d577fd74c48ae5ec151cfff818 100644
--- a/report/src/ecsgdp.cls
+++ b/report/src/ecsgdp.cls
@@ -108,6 +108,7 @@
\usepackage{tikz}
\usepackage{tikz-uml}
\usepackage[figuresright]{rotating}
+\usepackage{soul}
\lstset{captionpos=b,
frame=tb,
basicstyle=\scriptsize\ttfamily,