Beginning to refactor splitting, anticipating optimization.