Some overall work to get users integrated

Code is partly really unfinished, just merging to avoid future conflicts