Further work on drawing but still disabled
Latest working version of drawing
Further tidy up of drawing
Resolve conflicts with dev branch
Merge pull request #47 from Maprunner/draw-2

Draw 2