Broken down into class files and checks added for pontoon