Refactored, optimized, removed seeding
WIP