Add rough code for scalar figs... in progress