DataSet header files now being written and read (as yaml)
DataSet by-group support
FIX - Specs broken by last set of changes.