More work on editModels