Finished some more methods
-not working though ):