Starting on modifiable navgrids.
Merge conflicts