Cleanup
Cleanup and simplify
Add tmp authorization
Add controllers