added todo comments to client and server