Starting to merge Herman repo