Reintroduced intermediary scope; TODO scope merging when adding subcomponents