userhome changes
Merge origin/master
shit works