major cmake overhaul, added main test file back in, starting the 2d improvement, 3d implementation