Work in progress 11 (smoke test still fails) ...