Add AutoGrid, refactor 1stage