Feature/pull in habitat changes