Server enhanced. Some TDD done.