Merge Summon update

Incudes erroneously ignored files