Drawing generalized and improved, but not yet working