#165 (serverside) getting close