Feature add user model

Added a Bunch of things here... way more than the branch says.