Rolltracker refactor