Filled in methods

Filled in some of the methods and shtuff