Events refractored.
Improvements in containers
WIP
WIP cleanup