start of change to classes for experiments

currently non-functioning (but old code still works)