Removed user stuff, I need to work on that later