WIP
Bring in some bits from grimoire