started moving to external Api package
some progress
refurbished
switching between event types