continuing to cleanup the rest of this component… debugging… testing...