Initial commit

Support for events and resolve