refactor power model as part of the calculator