Interim work adding models and reorganized classes