first working version with events adding correctly!!