More work on WIP HGP system