Auth changes

I tried to keep this to Auth stuff but I may have screwed up some of the `[self start]` and `[self stop]`