started
defined abstractions
completed routing refactoring
misc
Merge branch 'routing-refactoring'