Just before acquiring Butler changes via tarball.  Almost done.