# This is a combination of 2 commits.
# The first commit's message is:

update to use latest tracker functions

# This is the 2nd commit message:

fix up tests, having identify issues though
gosquared: update tracker