Upgrade to indexed containers

I think that we'll probably want this anyway at some point (maybe for the OTT universe), so might as well get it out of the way. Let me know if there is any cleanup that you think can be done prior to merging.