Coords finished and a quick (temp) hack