namespace change
Draw map
Moved to more object oriented