refactor drawhandler

still broken