More tracking stuff, tentatively working