Option methods

Options now pass off to helper methods.