Revert "non global flags, everything but addz works"

This reverts commit cccd3eec0fb277dad8874183b162d9627ba7a158.
Revert "Revert "tried global flags...close but not quite""

This reverts commit 0b10f81e40b2fbee0855dd8113de74843dcddaf3.