Added an improved agenda group. It still has some problems, but it's pretty good