Finished Methods

Completed all the methods, in need of some finalising but they should
work.