merge conflit destroyed everything so adding oauth stuff again.

have to start handling for users on server side now