Fell into the hole of moving all has_n / has_one to new has_many / has_one.  Not done, but getting there.
Going to remove QuickQuery soon, but the specs cause extra errors