Map drawing

Another largish chunk of work