Adding a working router, start of refactoring
Removing knockout, not gonna switch evar