Added user home override setting
WIP
Refactor to remove custom User class