Setting up for first experiment
More fixes for initial experiment