working progress - so I can deploy