RollTracker Refactor