user auth now does what it should
merged and stuff