Finished all methods and now going through the tests