Added some more code from work on day two
Merged conflicts