Some more tests
Basic router added
Partial client stuff