Not really getting anywhere, but here's a commit.