- Sync with github in preparation for porting and refactoring
- Addition of Polymorphic Router