Fixed the program not properly closing as well as properly imported the two new class objects.