Testing Complete

Assignment Almost complete, just have to add comments, and tidy up code.