Had to fix cmake issues so made our own branch