Refactor to employ bait & switch as per issue #9