Stupid draw refactoring

Hey!