Implemented final touches on the client and server