Folding in Kate's new EDV diesgned to work with S. Still might need to clean up the gridsearch code to work with this, along with some prefixes etc.