refactor users out. need to fix broken tests now.