Fair bit of refactoring, trying to finish server w/o TDD for better understanding