Worked on the map

Signed-off-by: Adam