Got more Drawing stuff working