Another commit for safe-keeping. See docs/log.txt for progress so far.