Assoc and seed

Resolved merge conflicts