Authentication working - still need some code cleanup, maybe using deferred