Reworked option processing after discovering need for additional features. Basically working, but more tests in order...