Added internal map, will draw. Need to push when moving