Improved Router
Huge refactor
Merge branch 'better-routing'