Lots of analysis updates for looking at different edge classes