Refactored to just returning a list of points.