Changing to use an instance based event system