Work-in-progress for adding events handling.