Working on the options, nearly complete