Better coordinate system support, hacky dwell