Working on getting options working again