You are correct Damien Murphy, everything should be converted to functional components in my opinion. This won't take too long. I plan on tackling this work tomorrow along with the rest of the refactoring.