added TODO
added separate server start and separate client start