Added some drawing functions. Seems working