still working through new options struct changes

still working through new options struct changes