None of this is tested since the HDAT format for P9 hasn't been finalised. I'm posting this since Vasant expressed interest in reviewing the patches. Stewart please don't merge this.