Rather big commit, everything is working with client.  Promise to commit smaller and more frequently going foward