Move to vectors and points

replaced all the stray xs and ys with vectors and points