Move much more to the models.