Added Pen/Shape Drawing capabilities