Continuing to mod all code to work with Anyfesto