Image Tracking base code needs overhaul