Making progress... just a few more details to add.