starting work on group lists
Re-organized code, and renaming a number of of decs...