Refactor Flags
Tested again and can confirm every combination works correctly.
Merge pull request #830 from RobertBColton/master

Refactor Flags