More architectural work related to unique points tracking.