move most of the options back into code