Opt/Deopt seem to work okay. Gotta do some more flag stuff.
Chnaged the map to Fixed array to make AddFlags simpler