{Reviewer: Andy} Compatability with new Homestead API

As discussed, this is unit tested but not live tested.