HPCC-99999 WIP