User class files
User class sorta works now

I just went down a different route but will try again in the future
conflict resolved