First pass at tracking mode, not finished