Added needed interfaces to draw shapes
Preparing code base for drawing of shapes from the code
Adding the changes now for real