begin move to components