Alternate draw

Getting ready to merge alternateDraw with master