lots more progress and the general skeleton is in place...