Finalizing Route (first pass)
Refactor Routes

This looks like the optimal configuration for Routing...