Added some methods, tidied code, added more directions