adding events and logging2 (still in progress)