'Finished' the router, some testing and adding more functionality still needs to be done.