Added FlagSet (and git fixup).
Added some player handling state.