Messy, messy code. Seem to have tracking working a little better