More upgrade work. Upgrade class causing crash now.