Routing mechanism updated

Updated to draft version from iPad. This system is broken in its current
state, and will need to be completed.