Working on ChangeMap and IndexTracker. These classes could be much simpler....