Work in progress, 'price indexing' added.