cleaning up before recommtting HGS
adding some hgs setup in the mix. first pass (may need run twice to get db file)