Add events and questions
Much nicer class diagram layout
Add stages self-loop