XXX FIXME this is going to change, I'm going to blow out the data structures