finishing up adding new users, more work though :(