Support for P16 - first pass

New HS file - issue 2171