Made a couple new classes for CFG