Almost there on deduction refactoring, parameters are present and must
now be used