Finished off all the user OOification I think I'll be doing for now