Working on React solution here