Merge refacto and grid unit destruction branch