Getting closer to draft of client.