Some progress with drawing, but still bugged.