First mock up of the changes to cli, hub and builder