Still more model design work