Clayton: a commit before I do a major code overhaul