More general work on Compendium stuff