Finished first version of the --catch-up feature