Removing Habitat from the model, Part 1

This series of commits will cause a few breakages until I work out what
to do with the view and viewmodel