- refactored calculator to used switchable implementation of
plan-generator