a bit more progress
scripted update of code from master at 5ae379d a bit more progress