Continued work on DrawingCanvas