Added way generators
Cleaned up seeding