Check-in working version of Gorilla tracker