Make grid easier to understand and more readable

[ertemplin]

:fire: Not necessarily ready to merge :fire:

Some of this code looks pretty confusing, so we should review it before merging into master. This also lets us have discussions between commits.