Super Grid Controller Refactor/Cleanup/Delegation