WIP on making the code more React-y