A bit more work on options.