Converted everything to use FloatPoint2D