WIP on model-refactor