Untested, but probably working. Vagrant stuff still not done.