More functionality as well as created a visual testing class