Working map, with border dimensions.
merged with origin master.