Minor progress here on fixing the issues around tracking the secondary of the data.