More work on redoing the way models are built and handled.