Added client and server WIP