Added Inital Map classes
added more containers
added  mapblock
fixed conts
Merge branch 'master'