First rough pass at manip for grouped df