Add the incentive base class back..

These extra classes should just be created dynamically.