Still working on the 2d map