Progress on events object and an more work on an enum base class.