Moved around the fast rerouting code as well - this code may not compile - will get back into a running state shortly