Factoring out experiment defaults
A few tweaks to preproc field names
Starting model refactor