WARNING :: BROKEN ... checkpoint in reorganizing how events are managed