Swap to partial event hooks. Works with intelisense better than the frankenstein event with matching method