Doing some rework on my routing mechanism.