Commit some half-worked-out changes. This doesn't work at all currently.