Revert "Revert "Grid Unit Tracker""

This reverts commit 158366e71dd93c1e194448d5159ab5ec9dbbf4ed.