finalizing 2d version, adding homography next