Added basic replay mode
Merging