got rid of points and vectors so far so good