refactored routing
merge
fixes
Improved routing, need to write an example too...