Test documentation on macros
Start coming up with a "merge back to nom" plan