Refactor 2d

Ready for merge.  Lookin at you, Caswell
`for i, (lbl, x, y) in enumerate(zip(lbl_list, x_list, y_list)):`