Basic map structure

Fixed teh basic map structure.