Updated with changes made by Jimmy Da and Lucas Marks from the wip_bosh_lite branch