Minor rejiggering. Now in own .jsx file