Nuked some bugs. Auth seems to work reasonably now
Why was this in repo?