#83 began implementation of flag.