Finished rewriting handleFill