Added some drawing capability