TODO file
Moved routing logic around