lots of writeup draft edits
Merge branch 'clean_2groups'
editing editing YAY