Scaffolding for #155
Tweak scaffolding
Further tweaks