Completed the Track Events Implementation