Initial
Refactorings and styles
Interceptor
stuff
Lots of stuff
more