restructure complete, broke sorting.  Definitely simpler now though.