Nearly done transitioning to React