don't call add_type_arg anymore (it's unnecessary)
Put model in separate file for #386
load model from new separate file #386
sign new model file #386