Added class massage, testing