Finished user stuff I think... waiting for front end