Starting to move things into models.