Rare, not completely functional commit; too much done that I want to
keep, but I also need to push further.