Splitting User and Player objects. _slightly_ optimized
Merging changes