Reorganized models, dropped the "generic" check idea for now.