Flags add, near final version
Revert "Flags add, near final version"

This reverts commit d3118fd8a7ccd230b3ef7fa4fff38008434bfc60.