More progress - but still a lot of refinement to go