Added container management events and handlers (doing nothing atm)
Pull merge with ^M