Editted draft methods

Here are my edits to the methods. Quite a bit of work still to do, but I managed to delete about 4 pages of waffle!