First commit to separate branch

Also started creating a User Class