Event handler - a start

Doing it because I need to commit before I can pull.