wip on new grid