Restarting project; now using cmake