basic commit about server implementation