Adding stuff

Filled out the user methods, cleaned up a bit