Fixed onDisable for real, added infrastructure for real.