Refactor option parsing out into its own class, so it's easier to parse