React rewrite continued (WIP)