WIP - DNM - Spigot

[gidden]

This PR adds changes for the spigot project. To date these includ:

• adding message and macro file changes from #430

Required: write a single sentence that describes the changes made by this PR.

How to review

Required: describe specific things that reviewer(s) must do, in order to ensure that the PR achieves its goal. If no review is required, write “No review:” and describe why.

PR checklist

• [ ] Continuous integration checks all ✅

• [ ] Add or expand tests; coverage checks both ✅
• [ ] Add, expand, or update documentation.
• [ ] Update release notes.