Fixing/refactoring seeding (really this time)