#112 - Started some of the work to get upgrades to be evaluated the way units are
#49 - Added a unit cancelled trigger stub