Added rest of the methods
Cleaned up some comments