More work done on the options stuff.