Grouping prep1

flushing out the works service to make groupings easier, first of many refactorings before attempting regrouping