Worked a bit more on client.