Still trying to get options working again