WIP refactoring seeds and models