Started implementing the client more.