Added tests for template class, started tooling around with a router class, and updated the todo list.