rename
Cleaned up auth a bit