redid the Shuttle backend datastructures