Part 2 of CSS in-line rehaul - OpTracker done