First commit of in progress client