more model/adaptor work