[stability] Ensure stability of overhaul updates after merge

[TomHilder]

Ensure the stability of the feb2023-overhaul branch after merging #21, so that it can be itself merged onto the master branch.

[TomHilder]

#21 has been merged. The conflicts in grid.py were not straightforward to reconcile and will require further testing/modification. See PR thread for further detail.