Feature add users

This isn't quite ready for peer review. We still need to add some comments.