Update to 2d points and add GUI