Further structure refinement. Still working on basic group.