Made good progress on client and server