Added most of the replay infrastructure back