Request from Rich to merge work with Dharma

Merge work...