good progress made knocking this into shape