major refactor, preparing unimodel rename