Final Submission

Integrated the changes made from the test branch into master. The master branch was pulled from a tutorial repo as I had followed the tutorial but could not get the code to work. I then just continued the work into a test braanch