Almost finished, need to convert to a new coordinate system