stage one
Merge https://github.com/shep670/draw2