Features/coordmap

After various testing the other day, this should now be in a reasonable state to merge onto main.