Working towards adding full knobs again
Finish adding existing opt flags