diff --git a/data/launchdata-1971.json b/data/launchdata-1971.json
index f33277d..73acdfe 100644
--- a/data/launchdata-1971.json
+++ b/data/launchdata-1971.json
@@ -1175,7 +1175,7 @@
           "Operator": "",
           "Orbit": "Low Earth",
           "Function": "ELINT",
-          "Decay": "In orbit",
+          "Decay": "3 November 202303:27",
           "Outcome": "Successful",
           "Cubesat": false
         }
@@ -1261,7 +1261,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "19 April01:40:00[13]",
+        "TimestampRaw": "19 April01:40:00[14]",
         "TimestampClean": "19 April01:40:00",
         "Timestamp": "1971-04-19T01:40:00Z",
         "Tbd": false,
@@ -1637,7 +1637,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "10 May16:58:42[13]",
+        "TimestampRaw": "10 May16:58:42[14]",
         "TimestampClean": "10 May16:58:42",
         "Timestamp": "1971-05-10T16:58:42Z",
         "Tbd": false,
@@ -1715,7 +1715,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "19 May16:22:44[13]",
+        "TimestampRaw": "19 May16:22:44[14]",
         "TimestampClean": "19 May16:22:44",
         "Timestamp": "1971-05-19T16:22:44Z",
         "Tbd": false,
@@ -1828,7 +1828,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "28 May15:26:30[13]",
+        "TimestampRaw": "28 May15:26:30[14]",
         "TimestampClean": "28 May15:26:30",
         "Timestamp": "1971-05-28T15:26:30Z",
         "Tbd": false,
@@ -2909,7 +2909,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "2 September13:40:40[13]",
+        "TimestampRaw": "2 September13:40:40[14]",
         "TimestampClean": "2 September13:40:40",
         "Timestamp": "1971-09-02T13:40:40Z",
         "Tbd": false,
@@ -3230,7 +3230,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "28 September10:00:22[13]",
+        "TimestampRaw": "28 September10:00:22[14]",
         "TimestampClean": "28 September10:00:22",
         "Timestamp": "1971-09-28T10:00:22Z",
         "Tbd": false,
diff --git a/data/launchdata-2021.json b/data/launchdata-2021.json
index 2d9bc9a..1c88b5d 100644
--- a/data/launchdata-2021.json
+++ b/data/launchdata-2021.json
@@ -73,8 +73,8 @@
           "Operator": "University of Michigan",
           "Orbit": "Low Earth",
           "Function": "Technology demonstration",
-          "Decay": "In orbit",
-          "Outcome": "Operational",
+          "Decay": "15 June 2023",
+          "Outcome": "Successful",
           "Cubesat": true
         },
         {
@@ -91,8 +91,8 @@
           "Operator": "CU Boulder",
           "Orbit": "Low Earth",
           "Function": "Technology demonstration",
-          "Decay": "In orbit",
-          "Outcome": "Operational",
+          "Decay": "6 June 2023",
+          "Outcome": "Successful",
           "Cubesat": true
         },
         {
@@ -100,8 +100,8 @@
           "Operator": "U.S. Department of Defense",
           "Orbit": "Low Earth",
           "Function": "Technology demonstration",
-          "Decay": "In orbit",
-          "Outcome": "Operational",
+          "Decay": "27 April 2023",
+          "Outcome": "Successful",
           "Cubesat": true
         },
         {
@@ -109,8 +109,8 @@
           "Operator": "U.S. Department of Defense",
           "Orbit": "Low Earth",
           "Function": "Technology demonstration",
-          "Decay": "In orbit",
-          "Outcome": "Operational",
+          "Decay": "2 May 2023",
+          "Outcome": "Successful",
           "Cubesat": true
         },
         {
@@ -144,7 +144,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "19 January16:25[9]",
+        "TimestampRaw": "19 January16:25[17]",
         "TimestampClean": "19 January16:25",
         "Timestamp": "2021-01-19T16:25:00Z",
         "Tbd": false,
@@ -170,7 +170,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "20 January07:26[10]",
+        "TimestampRaw": "20 January07:26[18]",
         "TimestampClean": "20 January07:26",
         "Timestamp": "2021-01-20T07:26:00Z",
         "Tbd": false,
@@ -196,7 +196,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "20 January13:02[11]",
+        "TimestampRaw": "20 January13:02[19]",
         "TimestampClean": "20 January13:02",
         "Timestamp": "2021-01-20T13:02:00Z",
         "Tbd": false,
@@ -222,7 +222,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "24 January15:00[12]",
+        "TimestampRaw": "24 January15:00[20]",
         "TimestampClean": "24 January15:00",
         "Timestamp": "2021-01-24T15:00:00Z",
         "Tbd": false,
@@ -244,15 +244,6 @@
           "Outcome": "Successful",
           "Cubesat": false
         },
-        {
-          "Payload": "Exoport",
-          "Operator": "Exolaunch",
-          "Orbit": "Low Earth (SSO)",
-          "Function": "Satellite dispenser",
-          "Decay": "In orbit",
-          "Outcome": "Operational",
-          "Cubesat": false
-        },
         {
           "Payload": "ION SCV-002 Laurentius",
           "Operator": "D-Orbit",
@@ -412,7 +403,7 @@
           "Orbit": "Low Earth (SSO)",
           "Function": "Technology demonstration",
           "Decay": "In orbit",
-          "Outcome": "Operational",
+          "Outcome": "Successful",
           "Cubesat": true
         },
         {
@@ -482,7 +473,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "29 January04:47[70][71]",
+        "TimestampRaw": "29 January04:47[77][78]",
         "TimestampClean": "29 January04:47",
         "Timestamp": "2021-01-29T04:47:00Z",
         "Tbd": false,
@@ -526,7 +517,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "1 February08:15[72][73]",
+        "TimestampRaw": "1 February08:15[79][80]",
         "TimestampClean": "1 February08:15",
         "Timestamp": "2021-02-01T08:15:00Z",
         "Tbd": false,
@@ -552,7 +543,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "2 February20:45:28[76]",
+        "TimestampRaw": "2 February20:45:28[83]",
         "TimestampClean": "2 February20:45:28",
         "Timestamp": "2021-02-02T20:45:28Z",
         "Tbd": false,
@@ -578,7 +569,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "4 February06:19[79]",
+        "TimestampRaw": "4 February06:19[86]",
         "TimestampClean": "4 February06:19",
         "Timestamp": "2021-02-04T06:19:00Z",
         "Tbd": false,
@@ -604,7 +595,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "4 February15:36[80][81]",
+        "TimestampRaw": "4 February15:36[87][88]",
         "TimestampClean": "4 February15:36",
         "Timestamp": "2021-02-04T15:36:00Z",
         "Tbd": false,
@@ -630,7 +621,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "15 February04:45:05[82]",
+        "TimestampRaw": "15 February04:45:05[89]",
         "TimestampClean": "15 February04:45:05",
         "Timestamp": "2021-02-15T04:45:05Z",
         "Tbd": false,
@@ -656,7 +647,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "16 February03:59:37[84]",
+        "TimestampRaw": "16 February03:59:37[91]",
         "TimestampClean": "16 February03:59:37",
         "Timestamp": "2021-02-16T03:59:37Z",
         "Tbd": false,
@@ -682,7 +673,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "20 February17:36:50[86][87]",
+        "TimestampRaw": "20 February17:36:50[93][94]",
         "TimestampClean": "20 February17:36:50",
         "Timestamp": "2021-02-20T17:36:50Z",
         "Tbd": false,
@@ -843,7 +834,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "24 February02:22[137][138]",
+        "TimestampRaw": "24 February02:22[144][145]",
         "TimestampClean": "24 February02:22",
         "Timestamp": "2021-02-24T02:22:00Z",
         "Tbd": false,
@@ -887,7 +878,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "28 February04:54[139][140]",
+        "TimestampRaw": "28 February04:54[146][147]",
         "TimestampClean": "28 February04:54",
         "Timestamp": "2021-02-28T04:54:00Z",
         "Tbd": false,
@@ -976,7 +967,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "28 February06:55:01[151]",
+        "TimestampRaw": "28 February06:55:01[158]",
         "TimestampClean": "28 February06:55:01",
         "Timestamp": "2021-02-28T06:55:01Z",
         "Tbd": false,
@@ -1002,7 +993,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "4 March08:24:54[154]",
+        "TimestampRaw": "4 March08:24:54[161]",
         "TimestampClean": "4 March08:24:54",
         "Timestamp": "2021-03-04T08:24:54Z",
         "Tbd": false,
@@ -1028,7 +1019,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "11 March08:13:29[155]",
+        "TimestampRaw": "11 March08:13:29[162]",
         "TimestampClean": "11 March08:13:29",
         "Timestamp": "2021-03-11T08:13:29Z",
         "Tbd": false,
@@ -1054,7 +1045,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "11 March17:51:28[156]",
+        "TimestampRaw": "11 March17:51:28[163]",
         "TimestampClean": "11 March17:51:28",
         "Timestamp": "2021-03-11T17:51:28Z",
         "Tbd": false,
@@ -1080,7 +1071,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "13 March02:19[157][158]",
+        "TimestampRaw": "13 March02:19[164][165]",
         "TimestampClean": "13 March02:19",
         "Timestamp": "2021-03-13T02:19:00Z",
         "Tbd": false,
@@ -1124,7 +1115,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "14 March10:01:26[159]",
+        "TimestampRaw": "14 March10:01:26[166]",
         "TimestampClean": "14 March10:01:26",
         "Timestamp": "2021-03-14T10:01:26Z",
         "Tbd": false,
@@ -1150,7 +1141,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "22 March06:07:12[160]",
+        "TimestampRaw": "22 March06:07:12[167]",
         "TimestampClean": "22 March06:07:12",
         "Timestamp": "2021-03-22T06:07:12Z",
         "Tbd": false,
@@ -1446,7 +1437,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "22 March22:30[184][185]",
+        "TimestampRaw": "22 March22:30[191][192]",
         "TimestampClean": "22 March22:30",
         "Timestamp": "2021-03-22T22:30:00Z",
         "Tbd": false,
@@ -1526,7 +1517,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "24 March08:28:24[188]",
+        "TimestampRaw": "24 March08:28:24[195]",
         "TimestampClean": "24 March08:28:24",
         "Timestamp": "2021-03-24T08:28:24Z",
         "Tbd": false,
@@ -1552,7 +1543,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "25 March02:47:33[189]",
+        "TimestampRaw": "25 March02:47:33[196]",
         "TimestampClean": "25 March02:47:33",
         "Timestamp": "2021-03-25T02:47:33Z",
         "Tbd": false,
@@ -1578,7 +1569,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "30 March22:45[190]",
+        "TimestampRaw": "30 March22:45[197]",
         "TimestampClean": "30 March22:45",
         "Timestamp": "2021-03-30T22:45:00Z",
         "Tbd": false,
@@ -1604,7 +1595,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "7 April16:34:18[191]",
+        "TimestampRaw": "7 April16:34:18[198]",
         "TimestampClean": "7 April16:34:18",
         "Timestamp": "2021-04-07T16:34:18Z",
         "Tbd": false,
@@ -1630,7 +1621,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "8 April23:01[192]",
+        "TimestampRaw": "8 April23:01[199]",
         "TimestampClean": "8 April23:01",
         "Timestamp": "2021-04-08T23:01:00Z",
         "Tbd": false,
@@ -1656,7 +1647,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "9 April07:42:40[194]",
+        "TimestampRaw": "9 April07:42:40[201]",
         "TimestampClean": "9 April07:42:40",
         "Timestamp": "2021-04-09T07:42:40Z",
         "Tbd": false,
@@ -1682,7 +1673,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "23 April09:49:02[196]",
+        "TimestampRaw": "23 April09:49:02[203]",
         "TimestampClean": "23 April09:49:02",
         "Timestamp": "2021-04-23T09:49:02Z",
         "Tbd": false,
@@ -1708,7 +1699,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "25 April22:14:08[197]",
+        "TimestampRaw": "25 April22:14:08[204]",
         "TimestampClean": "25 April22:14:08",
         "Timestamp": "2021-04-25T22:14:08Z",
         "Tbd": false,
@@ -1734,7 +1725,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "26 April20:47[198]",
+        "TimestampRaw": "26 April20:47[205]",
         "TimestampClean": "26 April20:47",
         "Timestamp": "2021-04-26T20:47:00Z",
         "Tbd": false,
@@ -1760,7 +1751,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "27 April03:20[199][200]",
+        "TimestampRaw": "27 April03:20[206][207]",
         "TimestampClean": "27 April03:20",
         "Timestamp": "2021-04-27T03:20:00Z",
         "Tbd": false,
@@ -1858,7 +1849,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "29 April01:50:00[201]",
+        "TimestampRaw": "29 April01:50:00[208]",
         "TimestampClean": "29 April01:50:00",
         "Timestamp": "2021-04-29T01:50:00Z",
         "Tbd": false,
@@ -1920,7 +1911,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "29 April03:23:15[212][213]",
+        "TimestampRaw": "29 April03:23:15[219][220]",
         "TimestampClean": "29 April03:23:15",
         "Timestamp": "2021-04-29T03:23:15Z",
         "Tbd": false,
@@ -1946,7 +1937,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "29 April03:44[214]",
+        "TimestampRaw": "29 April03:44[221]",
         "TimestampClean": "29 April03:44",
         "Timestamp": "2021-04-29T03:44:00Z",
         "Tbd": false,
@@ -1972,7 +1963,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "30 April07:27[215]",
+        "TimestampRaw": "30 April07:27[222]",
         "TimestampClean": "30 April07:27",
         "Timestamp": "2021-04-30T07:27:00Z",
         "Tbd": false,
@@ -1998,7 +1989,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "4 May19:01:07[216]",
+        "TimestampRaw": "4 May19:01:07[223]",
         "TimestampClean": "4 May19:01:07",
         "Timestamp": "2021-05-04T19:01:07Z",
         "Tbd": false,
@@ -2024,7 +2015,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "6 May18:11[217][218]",
+        "TimestampRaw": "6 May18:11[224][225]",
         "TimestampClean": "6 May18:11",
         "Timestamp": "2021-05-06T18:11:00Z",
         "Tbd": false,
@@ -2077,7 +2068,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "9 May06:42[219]",
+        "TimestampRaw": "9 May06:42[226]",
         "TimestampClean": "9 May06:42",
         "Timestamp": "2021-05-09T06:42:00Z",
         "Tbd": false,
@@ -2103,7 +2094,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "15 May11:11[220]",
+        "TimestampRaw": "15 May11:11[227]",
         "TimestampClean": "15 May11:11",
         "Timestamp": "2021-05-15T11:11:00Z",
         "Tbd": false,
@@ -2138,7 +2129,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "15 May22:56[223]",
+        "TimestampRaw": "15 May22:56[230]",
         "TimestampClean": "15 May22:56",
         "Timestamp": "2021-05-15T22:56:00Z",
         "Tbd": false,
@@ -2182,7 +2173,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "18 May17:37[227]",
+        "TimestampRaw": "18 May17:37[234]",
         "TimestampClean": "18 May17:37",
         "Timestamp": "2021-05-18T17:37:00Z",
         "Tbd": false,
@@ -2226,7 +2217,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "19 May04:03[235]",
+        "TimestampRaw": "19 May04:03[242]",
         "TimestampClean": "19 May04:03",
         "Timestamp": "2021-05-19T04:03:00Z",
         "Tbd": false,
@@ -2252,7 +2243,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "26 May18:59[236]",
+        "TimestampRaw": "26 May18:59[243]",
         "TimestampClean": "26 May18:59",
         "Timestamp": "2021-05-26T18:59:00Z",
         "Tbd": false,
@@ -2278,7 +2269,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "28 May17:38:39[237]",
+        "TimestampRaw": "28 May17:38:39[244]",
         "TimestampClean": "28 May17:38:39",
         "Timestamp": "2021-05-28T17:38:39Z",
         "Tbd": false,
@@ -2304,7 +2295,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "29 May12:55:29[239][240]",
+        "TimestampRaw": "29 May12:55:29[246][247]",
         "TimestampClean": "29 May12:55:29",
         "Timestamp": "2021-05-29T12:55:29Z",
         "Tbd": false,
@@ -2330,7 +2321,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "2 June16:17:04[242]",
+        "TimestampRaw": "2 June16:17:04[249]",
         "TimestampClean": "2 June16:17:04",
         "Timestamp": "2021-06-02T16:17:04Z",
         "Tbd": false,
@@ -2356,7 +2347,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "3 June17:29:15[243]",
+        "TimestampRaw": "3 June17:29:15[250]",
         "TimestampClean": "3 June17:29:15",
         "Timestamp": "2021-06-03T17:29:15Z",
         "Tbd": false,
@@ -2418,7 +2409,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "6 June04:26[265]",
+        "TimestampRaw": "6 June04:26[272]",
         "TimestampClean": "6 June04:26",
         "Timestamp": "2021-06-06T04:26:00Z",
         "Tbd": false,
@@ -2444,7 +2435,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "11 June03:03[266][267]",
+        "TimestampRaw": "11 June03:03[273][274]",
         "TimestampClean": "11 June03:03",
         "Timestamp": "2021-06-11T03:03:00Z",
         "Tbd": false,
@@ -2497,7 +2488,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "12 June[270]",
+        "TimestampRaw": "12 June[277]",
         "TimestampClean": "12 June",
         "Timestamp": "2021-06-12T00:00:00Z",
         "Tbd": false,
@@ -2523,7 +2514,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "13 June08:11[271]",
+        "TimestampRaw": "13 June08:11[278]",
         "TimestampClean": "13 June08:11",
         "Timestamp": "2021-06-13T08:11:00Z",
         "Tbd": false,
@@ -2549,7 +2540,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "15 June13:35[274]",
+        "TimestampRaw": "15 June13:35[281]",
         "TimestampClean": "15 June13:35",
         "Timestamp": "2021-06-15T13:35:00Z",
         "Tbd": false,
@@ -2593,7 +2584,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "17 June01:22:27[276][277]",
+        "TimestampRaw": "17 June01:22:27[283][284]",
         "TimestampClean": "17 June01:22:27",
         "Timestamp": "2021-06-17T01:22:27Z",
         "Tbd": false,
@@ -2619,7 +2610,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "17 June16:09:35[279]",
+        "TimestampRaw": "17 June16:09:35[286]",
         "TimestampClean": "17 June16:09:35",
         "Timestamp": "2021-06-17T16:09:35Z",
         "Tbd": false,
@@ -2645,7 +2636,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "18 June06:30[281]",
+        "TimestampRaw": "18 June06:30[288]",
         "TimestampClean": "18 June06:30",
         "Timestamp": "2021-06-18T06:30:00Z",
         "Tbd": false,
@@ -2698,7 +2689,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "25 June19:50:00[282]",
+        "TimestampRaw": "25 June19:50:00[289]",
         "TimestampClean": "25 June19:50:00",
         "Timestamp": "2021-06-25T19:50:00Z",
         "Tbd": false,
@@ -2724,7 +2715,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "29 June23:27:20[286]",
+        "TimestampRaw": "29 June23:27:20[293]",
         "TimestampClean": "29 June23:27:20",
         "Timestamp": "2021-06-29T23:27:20Z",
         "Tbd": false,
@@ -2750,7 +2741,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "30 June14:47[287]",
+        "TimestampRaw": "30 June14:47[294]",
         "TimestampClean": "30 June14:47",
         "Timestamp": "2021-06-30T14:47:00Z",
         "Tbd": false,
@@ -2821,7 +2812,7 @@
     },
     {
       "Timestamp": {
-        "TimestampRaw": "30 June19:31[292]",
+        "TimestampRaw": "30 June19:31[299]",
         "TimestampClean": "30 June19:31",
         "Timestamp": "2021-06-30T19:31:00Z",
         "Tbd": false,