Pulling the trackers out into a separate method
Merge branch 'master' into adscanceled
Cleaning up play/pause events