Almost final changes for having the offline/online experiments engine
ready before the 2nd review.