tests
some progress finally, Router might be done for now