Checkpoint. ClientBuilder is almost there but before functional need to implement codec