Refarctoring to include two-box vagrant setup