More cleanup, including the old specs in the new layout, but will later rearrange so tha the namedtuple strategy is the first