WIP
Refactoring simple model