Adding tracked event handling. #2 #4 #5