Commit before split.
Factoring UI out.