Revamp how we're swizzling the data so we can show nicer groups, including just a straight table