Working toward refactoring to a more generic event based system.