moved drawing handle to new class