Started refactoring experiment class