initial rework switching to components and action wiring