A little more progress on this one almost done

•