Refactoring and still working on seeds.