WIP
Refactoring simple model
Add a pondmen column