Added events to the system
This closes #4