Continuing basic work on client and server