Data structure is finally playing nice