merging in compendia code

merging in the switch to compendia.