make everything Coordinate based
that was a bit messy