Adding some basic event tracking