Updating ExerciseQueue and CatalogManager to match project