Ckozak/suggested quantity refactor

I can rev the rules version if necessary, but it's been growing very quickly. Perhaps 1 rev per sprint/build when necessary would be a good change?