moved more stuff to react