Introducing Waypoints, Tracking with drawing added