Big change.

I have no idea what I'm doing with CommandFlags, but let's give it a
shot first.