Added some basic event tracking and removed some console logging