Merge assign_locations and store_locations
Move set of varying matches into linked lists
Fixup