Commit of work done by joseph@schilz.org.