Integrating

1) continued work on pause and replay