Restructured to remove need for customized Anemone, several of other major improvements