consolidate more code, less references to sections, more to parents