Feature create users

Still WIP but would be great to merge into my previous branch.