Users stuff mostly done besides new user template