Add GDP data, and updates to code to incorporate into normalisation.