DEVELOPER-902 refactor tracking code to async
Merge pull request #455 from pmuir/DEVELOPER-902

DEVELOPER-902 refactor tracking code to async