Moving controller to new grid-based strategy