Almost Complete Auth
User Auth Finished
Merged master into branch