Moving to events and container
Make examples work