Add Tracking System scaffold