WIP: Refactoring to use headers instead of signatures