Added multiple classes, testing implementation