Feature add users

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