Finished a first version of the new --catch-up feature