Just one drawnMap
Moved map building to own file