Add in customizations from old harness repo