12/09 Massive Changes done to Compendium. See commits for full details.