Tests passing, need to clean up the catchupDelay code
Tests are passing. Swap files are handled correctly (manual test).