Starting work on the new routing code and exception handling