Sketched arch. of builders for client now exist. Time to start writing tests and implementing.