hb added router and mocks addon. Still working on unit tests.