more work on draw stuff