Working on adding hierarchical objects and containment structure.