Split out splitting/drawing