Merge fancy coords into master

This shouldn't be the dev branch