working through more tracking stuff