Start adding router. Fix tests.