Ported the drawing stuff from the rel_2_branch. Given the effort this took I'm really really wanting to move to subversion.