-- thinking through and updating component pieces