Begin turning the normalization code into a two-step process, first Django query expansion, then conversion to DNF. First step is done (ish)