Further work on option parsing; will likely roll own parser