More progress
Add support for events