Modified Demo Beginning, added Cells and Map