Simplify drawing method and stub out fill method