refactoring
don't require objects to be Drawable