Auth working, needs more improvements
fixing merge conflicts