Fixed everything except adding new User