Started incorporating Geraints CC/oct conversions