started to re-enable submodels, needs additional work