initial push of joint tracking code