Added the groundwork to pick up on optional parameters for options.