Done a bit more work on the core macro system.
Merge https://github.com/Sackboii/Sacro