WIP Modle Refactoring