Lots of little refactors and start of interceptor work