QuickMod refactor

Yes.