completed server implementation. Started organizing proper tests