shape state determined by config file and added experiment files
Merge remote-tracking branch 'upstream/shape' into shape