Groupby now works (I think)