Really added mutable collections now and made the existing code use the new structure.