Starting fix for cli and skip events feature
More skipEvents
Fixed cli