Radical new design experiment. May be reverted. Issue: #370