Added On class. Events are complete, now have to work out clean adding
of events into vector.