Final commit and code ready for handing in