2.3/fix users

Some progress on users. Expect more soon.