move  everything to  props