Server - client development continue