Template Tracking is out. Simplified model quite a bit