A little more work. I have more important things to take care of, but if somebody wants to continue on this path, users are completed.

Signed-off-by: Ben Corlett <bencorlett@me.com>