Updated login stuff
Big commit