Finished user role functionality (for now) and changed a bunch of stuff