slowly factoring code in ...
 more slow progress
 slowly continuing mockup port ...