added grouping to the various objects and fixed my inheritance