working on #44

adding functionality to server