push options decomposition up so we can extract