Options index refactor

all specs passing