refactored some names
refactored some more names
refactored some more, more names
adds a User class
Merge remote-tracking branch 'pascal/master'