Adding events and some test code.