some more work towards vagrant stuff, #25