Clean up and Add router
Merge branch 'master' of https://github.com/krazemon/arctic into mr