Redesigned the Router and created tests for it (TDD rocks!)