diff --git a/core/resources-src/datafiles/thrustcurves/manual/AT_F101T.eng b/core/resources-src/datafiles/thrustcurves/manual/AT_F101T.eng
new file mode 100644
index 000000000..0afabd315
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/manual/AT_F101T.eng
@@ -0,0 +1,26 @@
+; TODO: Length and weights taken from F72!!
+
+; Based on
+; http://www.aerotech-rocketry.com/customersite/resource_library/Instructions/MR-SU_Instructions/d-f_non-std_su_in_21002.pdf
+
+; Made by Sampo Niskanen
+F101T 24 124 5-10-15 0.0368 0.0742 AT
+   0.04 85.95
+   0.069 83.4
+   0.129 86.461
+   0.202 94.622
+   0.274 100.743
+   0.354 104.569
+   0.443 106.099
+   0.446 102.783
+   0.546 96.662
+   0.575 90.031
+   0.602 89.011
+   0.625 84.675
+   0.671 80.85
+   0.731 76.259
+   0.771 58.406
+   0.807 33.921
+   0.85 18.108
+   0.893 11.477
+   0.942 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt
index c27bc24cb..b8de3071f 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt
@@ -1,5 +1,5 @@
 Rocket motor simulation data downloaded from ThrustCurve.org.
-This ZIP file contains 1645 simulator data files.
+This ZIP file contains 1656 simulator data files.
 For more info, please see http://www.thrustcurve.org/
 
 AMW_I195.eng
@@ -7434,14 +7434,14 @@ Cesaroni_M1590.eng
     Designation:  7545M1590-P
     Data Format:  RASP
     Data Source:  cert
-    Contributor:  Andre Choquette
+    Contributor:  Mark Koelsch
 
 Cesaroni_M1590.rse
     Manufacturer: Cesaroni Technology
     Designation:  7545M1590-P
     Data Format:  RockSim
     Data Source:  cert
-    Contributor:  Andre Choquette
+    Contributor:  Mark Koelsch
 
 Cesaroni_M1670.eng
     Manufacturer: Cesaroni Technology
@@ -9394,7 +9394,7 @@ Estes_B4.eng
     Designation:  B4
     Data Format:  RASP
     Data Source:  user
-    Contributor:  John Coker
+    Contributor:  Nicholas Domansky
 
 Estes_B4.rse
     Manufacturer: Estes Industries
@@ -9403,6 +9403,13 @@ Estes_B4.rse
     Data Source:  user
     Contributor:  John Coker
 
+Estes_B4_1.eng
+    Manufacturer: Estes Industries
+    Designation:  B4
+    Data Format:  RASP
+    Data Source:  user
+    Contributor:  John Coker
+
 Estes_B6.eng
     Manufacturer: Estes Industries
     Designation:  B6
@@ -9450,7 +9457,7 @@ Estes_C6.eng
     Designation:  C6
     Data Format:  RASP
     Data Source:  user
-    Contributor:  John Coker
+    Contributor:  Nicholas Domansky
 
 Estes_C6.rse
     Manufacturer: Estes Industries
@@ -9459,6 +9466,13 @@ Estes_C6.rse
     Data Source:  user
     Contributor:  John Coker
 
+Estes_C6_1.eng
+    Manufacturer: Estes Industries
+    Designation:  C6
+    Data Format:  RASP
+    Data Source:  user
+    Contributor:  John Coker
+
 Estes_D11.eng
     Manufacturer: Estes Industries
     Designation:  D11
@@ -9732,6 +9746,13 @@ GR_L1065.eng
     Data Source:  mfr
     Contributor:  John Coker
 
+GR_L1112.eng
+    Manufacturer: Gorilla Rocket Motors
+    Designation:  L1112BT
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 GR_L1150.rse
     Manufacturer: Gorilla Rocket Motors
     Designation:  L1150WC
@@ -9802,6 +9823,13 @@ GR_M1665.eng
     Data Source:  mfr
     Contributor:  John Coker
 
+GR_M1952.eng
+    Manufacturer: Gorilla Rocket Motors
+    Designation:  M1952BT
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 GR_O2700.eng
     Manufacturer: Gorilla Rocket Motors
     Designation:  O2700BL
@@ -10635,6 +10663,13 @@ Loki_J1000.rse
     Data Source:  mfr
     Contributor:  Mark Koelsch
 
+Loki_J1026.eng
+    Manufacturer: Loki Research
+    Designation:  J1026 CT
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 Loki_J175.eng
     Manufacturer: Loki Research
     Designation:  J175-LW
@@ -10754,6 +10789,13 @@ Loki_J820.rse
     Data Source:  user
     Contributor:  John Coker
 
+Loki_K1127.eng
+    Manufacturer: Loki Research
+    Designation:  K1127LB
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 Loki_K250.eng
     Manufacturer: Loki Research
     Designation:  K250-LW
@@ -10782,6 +10824,13 @@ Loki_K350.rse
     Data Source:  user
     Contributor:  John Coker
 
+Loki_K527.eng
+    Manufacturer: Loki Research
+    Designation:  K527LR
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 Loki_K690.eng
     Manufacturer: Loki Research
     Designation:  K690-SF
@@ -10852,6 +10901,13 @@ Loki_L780.eng
     Data Source:  mfr
     Contributor:  John Coker
 
+Loki_L840.eng
+    Manufacturer: Loki Research
+    Designation:  L840CT
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 Loki_L930.eng
     Manufacturer: Loki Research
     Designation:  L930-LW
@@ -10873,6 +10929,13 @@ Loki_M1200.eng
     Data Source:  mfr
     Contributor:  John Coker
 
+Loki_M1650.eng
+    Manufacturer: Loki Research
+    Designation:  M1650LC
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 Loki_M1882.eng
     Manufacturer: Loki Research
     Designation:  M1882-LW
@@ -10887,6 +10950,13 @@ Loki_M1882.rse
     Data Source:  user
     Contributor:  John Coker
 
+Loki_M1969.eng
+    Manufacturer: Loki Research
+    Designation:  M1969SF
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 Loki_M2550.eng
     Manufacturer: Loki Research
     Designation:  M2550-LB
@@ -10915,6 +10985,13 @@ Loki_M3000.rse
     Data Source:  mfr
     Contributor:  Mark Koelsch
 
+Loki_M3464.eng
+    Manufacturer: Loki Research
+    Designation:  M3464LB
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Mark Koelsch
+
 Loki_M900.rse
     Manufacturer: Loki Research
     Designation:  M900-LR
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.eng
index 02d639e1b..0fdfa1d30 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.eng
@@ -1,41 +1,19 @@
-;
-;Aerotech G25 RASP.ENG file made from NAR published data
-;File produced July 4, 2000
-;The total impulse, peak thrust, average thrust and burn time are
-;the same as the averaged static test data on the NAR web site in
-;the certification file. The curve drawn with these data points is as
-;close to the certification curve as can be with such a limited
-;number of points (32) allowed with wRASP up to v1.6.
-G25 29 124 5-10-15 0.0625 0.1197 AeroTech
-0.035 30.499
-0.047 36.712
-0.059 41.18
-0.13 40.669
-0.177 38.969
-0.295 38.969
-0.343 40.947
-0.413 40.38
-0.437 38.69
-0.484 39.824
-0.532 37.845
-0.65 37.557
-0.721 38.969
-0.803 38.69
-0.85 37.279
-0.98 39.535
-1.063 36.434
-1.098 38.124
-1.252 37.845
-1.37 37.279
-1.583 37
-1.819 35.3
-1.984 33.61
-2.185 31.344
-2.315 28.809
-2.622 24.286
-3.024 18.917
-3.39 13.838
-3.839 7.624
-4.323 4.518
-4.783 2.541
-5.3 0
+G25W-10A 29 152.4 10 0.097 0.17 AT
+   0.01 38.046
+   0.029 21.768
+   0.11 30.475
+   0.239 35.775
+   0.496 40.696
+   0.568 42.116
+   0.592 45.429
+   0.749 46.186
+   0.997 45.713
+   1.255 44.198
+   1.498 39.939
+   1.999 31.421
+   2.501 23.093
+   3.006 14.196
+   3.503 7.288
+   3.999 4.07
+   4.371 1.988
+   4.414 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25_1.eng
index 0fdfa1d30..02d639e1b 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25_1.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25_1.eng
@@ -1,19 +1,41 @@
-G25W-10A 29 152.4 10 0.097 0.17 AT
-   0.01 38.046
-   0.029 21.768
-   0.11 30.475
-   0.239 35.775
-   0.496 40.696
-   0.568 42.116
-   0.592 45.429
-   0.749 46.186
-   0.997 45.713
-   1.255 44.198
-   1.498 39.939
-   1.999 31.421
-   2.501 23.093
-   3.006 14.196
-   3.503 7.288
-   3.999 4.07
-   4.371 1.988
-   4.414 0.0
+;
+;Aerotech G25 RASP.ENG file made from NAR published data
+;File produced July 4, 2000
+;The total impulse, peak thrust, average thrust and burn time are
+;the same as the averaged static test data on the NAR web site in
+;the certification file. The curve drawn with these data points is as
+;close to the certification curve as can be with such a limited
+;number of points (32) allowed with wRASP up to v1.6.
+G25 29 124 5-10-15 0.0625 0.1197 AeroTech
+0.035 30.499
+0.047 36.712
+0.059 41.18
+0.13 40.669
+0.177 38.969
+0.295 38.969
+0.343 40.947
+0.413 40.38
+0.437 38.69
+0.484 39.824
+0.532 37.845
+0.65 37.557
+0.721 38.969
+0.803 38.69
+0.85 37.279
+0.98 39.535
+1.063 36.434
+1.098 38.124
+1.252 37.845
+1.37 37.279
+1.583 37
+1.819 35.3
+1.984 33.61
+2.185 31.344
+2.315 28.809
+2.622 24.286
+3.024 18.917
+3.39 13.838
+3.839 7.624
+4.323 4.518
+4.783 2.541
+5.3 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.eng
index 9077b1b00..b8b3ad9cf 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.eng
@@ -1,30 +1,13 @@
-; AeroTech H45W
-; converted from TMT test stand data 1998 (www.tripoli.org)
-; provided by ThrustCurve.org (www.thrustcurve.org)
-H45W 38 194 0 0.193984 0.294784 AT
-   0.141 62.554
-   0.424 63.504
-   0.707 65.913
-   0.992 68.370
-   1.276 69.315
-   1.559 68.523
-   1.843 67.231
-   2.127 65.705
-   2.411 63.154
-   2.695 59.210
-   2.979 55.600
-   3.264 50.790
-   3.547 45.237
-   3.830 39.835
-   4.115 34.562
-   4.399 29.213
-   4.682 24.720
-   4.967 20.616
-   5.251 17.475
-   5.534 14.498
-   5.818 12.697
-   6.102 10.792
-   6.386 9.229
-   6.670 7.754
-   6.954 6.075
-   7.239 0.000
+; From AT DMS announcement May 2014.
+H45 38 202.7 10 0.18 0.364 AT
+   0.04 84.004
+   0.854 86.004
+   1.377 84.804
+   2.046 79.204
+   2.69 66.003
+   3.286 51.603
+   4.414 28.401
+   5.042 16.001
+   5.429 9.2
+   6.113 6.4
+   6.186 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45_1.eng
index b8b3ad9cf..9077b1b00 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45_1.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45_1.eng
@@ -1,13 +1,30 @@
-; From AT DMS announcement May 2014.
-H45 38 202.7 10 0.18 0.364 AT
-   0.04 84.004
-   0.854 86.004
-   1.377 84.804
-   2.046 79.204
-   2.69 66.003
-   3.286 51.603
-   4.414 28.401
-   5.042 16.001
-   5.429 9.2
-   6.113 6.4
-   6.186 0.0
+; AeroTech H45W
+; converted from TMT test stand data 1998 (www.tripoli.org)
+; provided by ThrustCurve.org (www.thrustcurve.org)
+H45W 38 194 0 0.193984 0.294784 AT
+   0.141 62.554
+   0.424 63.504
+   0.707 65.913
+   0.992 68.370
+   1.276 69.315
+   1.559 68.523
+   1.843 67.231
+   2.127 65.705
+   2.411 63.154
+   2.695 59.210
+   2.979 55.600
+   3.264 50.790
+   3.547 45.237
+   3.830 39.835
+   4.115 34.562
+   4.399 29.213
+   4.682 24.720
+   4.967 20.616
+   5.251 17.475
+   5.534 14.498
+   5.818 12.697
+   6.102 10.792
+   6.386 9.229
+   6.670 7.754
+   6.954 6.075
+   7.239 0.000
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.eng
index 6e0111c66..4808b3e45 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.eng
@@ -1,30 +1,15 @@
-; AeroTech I65W
-; converted from TMT test stand data 1997 (www.tripoli.org)
-; provided by ThrustCurve.org (www.thrustcurve.org)
-I65W 54 235 0 0.41216 0.7616 AT
-   0.180 125.414
-   0.544 139.304
-   0.908 145.369
-   1.273 148.283
-   1.638 146.745
-   2.002 139.049
-   2.367 131.200
-   2.731 123.276
-   3.096 113.454
-   3.460 102.368
-   3.825 90.210
-   4.190 78.084
-   4.554 66.812
-   4.919 55.780
-   5.283 47.281
-   5.648 39.154
-   6.012 32.528
-   6.377 27.069
-   6.742 22.099
-   7.106 18.095
-   7.471 14.819
-   7.835 12.097
-   8.200 9.763
-   8.565 7.875
-   8.929 5.999
-   9.294 0.000
+; From AT DMS announcement May 2014.
+I65 54 218 10 0.377 0.752 AT
+   0.023 148.274
+   0.211 196.341
+   0.398 167.827
+   0.797 149.903
+   1.395 135.239
+   2.238 122.204
+   3.199 99.392
+   4.711 69.249
+   5.367 48.882
+   6.246 29.329
+   6.926 15.479
+   7.395 11.406
+   8.496 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65_1.eng
index 4808b3e45..6e0111c66 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65_1.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65_1.eng
@@ -1,15 +1,30 @@
-; From AT DMS announcement May 2014.
-I65 54 218 10 0.377 0.752 AT
-   0.023 148.274
-   0.211 196.341
-   0.398 167.827
-   0.797 149.903
-   1.395 135.239
-   2.238 122.204
-   3.199 99.392
-   4.711 69.249
-   5.367 48.882
-   6.246 29.329
-   6.926 15.479
-   7.395 11.406
-   8.496 0.0
+; AeroTech I65W
+; converted from TMT test stand data 1997 (www.tripoli.org)
+; provided by ThrustCurve.org (www.thrustcurve.org)
+I65W 54 235 0 0.41216 0.7616 AT
+   0.180 125.414
+   0.544 139.304
+   0.908 145.369
+   1.273 148.283
+   1.638 146.745
+   2.002 139.049
+   2.367 131.200
+   2.731 123.276
+   3.096 113.454
+   3.460 102.368
+   3.825 90.210
+   4.190 78.084
+   4.554 66.812
+   4.919 55.780
+   5.283 47.281
+   5.648 39.154
+   6.012 32.528
+   6.377 27.069
+   6.742 22.099
+   7.106 18.095
+   7.471 14.819
+   7.835 12.097
+   8.200 9.763
+   8.565 7.875
+   8.929 5.999
+   9.294 0.000
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng
index a3e98ccd3..6bc79404d 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng
@@ -1,37 +1,42 @@
-; M1780NT Redesign and recert
-M1780NT-PS 75 665 P 2.46 4.649 AT
-   0.014 1112.055
-   0.015 1497.932
-   0.022 1783.542
-   0.036 2105.612
-   0.047 2157.265
-   0.066 2169.419
-   0.104 2123.843
-   0.14 2108.651
-   0.164 2135.996
-   0.197 2129.92
-   0.238 2157.265
-   0.263 2205.88
-   0.274 2169.419
-   0.312 2145.112
-   0.411 2111.689
-   0.595 2081.305
-   0.899 2075.228
-   1.299 2047.883
-   1.601 1996.23
-   1.899 1938.5
-   2.058 1889.886
-   2.201 1813.926
-   2.3 1753.158
-   2.423 1701.505
-   2.467 1622.506
-   2.508 1555.662
-   2.566 1336.897
-   2.62 1112.055
-   2.67 893.29
-   2.724 668.448
-   2.755 568.181
-   2.812 486.144
-   2.9 267.379
-   2.999 75.96
-   3.029 0.0
+; AT M1780NT 1" Core Revised
+M1780NT 75 665 P 2.371 4.606 AT
+   0.0090 1337.154
+   0.026 2005.731
+   0.04 2106.521
+   0.046 2163.636
+   0.085 2156.916
+   0.108 2126.679
+   0.134 2113.24
+   0.168 2130.039
+   0.205 2126.679
+   0.259 2197.233
+   0.299 2156.916
+   0.347 2130.039
+   0.399 2123.32
+   0.495 2103.161
+   0.595 2089.723
+   0.697 2079.644
+   0.8 2083.003
+   0.9 2076.284
+   0.999 2069.565
+   1.201 2056.126
+   1.398 2029.248
+   1.603 2002.371
+   1.799 1965.414
+   1.998 1904.94
+   2.2 1817.588
+   2.3 1757.114
+   2.354 1723.517
+   2.405 1713.438
+   2.46 1629.446
+   2.502 1558.893
+   2.571 1333.794
+   2.622 1115.415
+   2.67 890.316
+   2.724 665.217
+   2.758 571.146
+   2.798 507.312
+   2.83 446.838
+   2.901 265.415
+   3.003 73.913
+   3.035 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780_1.eng
index 6bc79404d..42b6beb7a 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780_1.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780_1.eng
@@ -1,42 +1,23 @@
-; AT M1780NT 1" Core Revised
-M1780NT 75 665 P 2.371 4.606 AT
-   0.0090 1337.154
-   0.026 2005.731
-   0.04 2106.521
-   0.046 2163.636
-   0.085 2156.916
-   0.108 2126.679
-   0.134 2113.24
-   0.168 2130.039
-   0.205 2126.679
-   0.259 2197.233
-   0.299 2156.916
-   0.347 2130.039
-   0.399 2123.32
-   0.495 2103.161
-   0.595 2089.723
-   0.697 2079.644
-   0.8 2083.003
-   0.9 2076.284
-   0.999 2069.565
-   1.201 2056.126
-   1.398 2029.248
-   1.603 2002.371
-   1.799 1965.414
-   1.998 1904.94
-   2.2 1817.588
-   2.3 1757.114
-   2.354 1723.517
-   2.405 1713.438
-   2.46 1629.446
-   2.502 1558.893
-   2.571 1333.794
-   2.622 1115.415
-   2.67 890.316
-   2.724 665.217
-   2.758 571.146
-   2.798 507.312
-   2.83 446.838
-   2.901 265.415
-   3.003 73.913
-   3.035 0.0
+M1780 75 665 P 2.56 4.715 AT
+   0.028 2204.193
+   0.118 2566.025
+   0.173 2566.025
+   0.341 2214.151
+   0.44 2144.44
+   0.636 2114.564
+   1.34 2134.482
+   1.395 2204.193
+   1.648 2121.203
+   1.841 2041.534
+   1.874 1895.473
+   2.127 1643.186
+   2.353 1517.042
+   2.584 1460.61
+   2.672 1347.744
+   2.763 1068.901
+   2.829 723.666
+   2.939 438.183
+   2.999 292.122
+   3.101 172.617
+   3.272 36.515
+   3.5 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F31.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F31.rse
new file mode 100644
index 000000000..70d60e7d1
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F31.rse
@@ -0,0 +1,27 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="56-F31-CL-12A" Type="unspecified" dia="24." len="98.0008"
+initWt="102." propWt="32." delays="13,9,7,5,3" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="30.41" peakThrust="64.053" throatDia="0."
+exitDia="0." Itot="55.589" burn-time="1.83" massFrac="31.37" Isp="177.14"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>CTI 56-F31-CL-12A</comments>
+    <data>
+      <eng-data  t="0." f="0." m="32." cg="49."/>
+      <eng-data  t="0.001" f="3.483" m="31.999" cg="49."/>
+      <eng-data  t="0.023" f="64.053" m="31.5714" cg="49."/>
+      <eng-data  t="0.05" f="31.347" m="30.83" cg="49."/>
+      <eng-data  t="0.059" f="28.459" m="30.6751" cg="49."/>
+      <eng-data  t="0.095" f="32.027" m="30.0483" cg="49."/>
+      <eng-data  t="0.212" f="36.189" m="27.7511" cg="49."/>
+      <eng-data  t="0.344" f="37.549" m="24.9496" cg="49."/>
+      <eng-data  t="1.567" f="26.165" m="2.5217" cg="49."/>
+      <eng-data  t="1.631" f="26.93" m="1.54365" cg="49."/>
+      <eng-data  t="1.663" f="25.316" m="1.06244" cg="49."/>
+      <eng-data  t="1.785" f="3.653" m="0.0452111" cg="49."/>
+      <eng-data  t="1.828" f="0." m="0." cg="49."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.eng
index 81c65efa8..d7442f0ca 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.eng
@@ -1,21 +1,28 @@
-; Pro75-6G 7545M1590-CL P
-M1590-CL 75 893 P 3.1590000000000003 5.223 CTI
-   0.028 1210.592
-   0.059 2024.222
-   0.163 2235.371
-   0.214 2302.939
-   0.492 2153.727
-   0.767 2091.79
-   1.015 2103.051
-   1.335 2083.344
-   1.571 2029.852
-   2.366 1779.288
-   3.488 1534.354
-   3.755 1030.41
-   3.895 960.027
-   4.12 650.341
-   4.207 591.219
-   4.44 340.655
-   4.665 199.888
-   4.778 90.091
+M1590 75 893 P 3.59 6.0760000000000005 CTI
+   0.053 2045.469
+   0.119 2130.875
+   0.133 2220.551
+   0.226 2305.957
+   0.363 2241.903
+   0.438 2177.849
+   0.571 2130.875
+   0.748 2092.443
+   0.973 2088.172
+   1.225 2100.983
+   1.433 2079.632
+   1.597 2032.659
+   1.995 1883.198
+   2.411 1759.36
+   3.362 1567.197
+   3.491 1533.035
+   3.721 1076.113
+   3.769 1012.059
+   3.871 973.626
+   3.946 896.761
+   4.074 687.517
+   4.132 640.544
+   4.203 619.192
+   4.504 294.65
+   4.641 226.325
+   4.716 170.812
    4.8 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.rse
index 5149f7bff..3ac75cefd 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.rse
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.rse
@@ -1,11 +1,11 @@
 <engine-database>
   <engine-list>
-    <engine  mfg="CTI" code="M1590-CL" Type="unspecified" dia="75." len="893." initWt="5223."
-propWt="3159." delays="0" auto-calc-mass="1" auto-calc-cg="1" avgThrust="1574.92"
-peakThrust="2302.94" throatDia="0." exitDia="0." Itot="7559.63" burn-time="4.8"
-massFrac="60.48" Isp="244.02" tDiv="10" tStep="-1." tFix="1" FDiv="10"
-FStep="-1." FFix="1" mDiv="10" mStep="-1." mFix="1" cgDiv="10" cgStep="-1."
-cgFix="1">
+    <engine  mfg="Cesaroni Technology Inc." code="M1590-CL" Type="reloadable" dia="75."
+len="893." initWt="6076." propWt="3590." delays="1000" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="1574.92" peakThrust="2302.94" throatDia="0."
+exitDia="0." Itot="7559.63" burn-time="4.8" massFrac="60.48" Isp="244.02"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
     <comments>Pro75-6G 7545M1590-CL P</comments>
     <data>
       <eng-data  t="0." f="0." m="3159." cg="446.5"/>
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.eng
index 64b099809..07eaa5472 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.eng
@@ -1,34 +1,31 @@
-;
-;Estes B4 RASP.ENG file made from NAR published data
-;File produced October 3, 2000
-;The total impulse, peak thrust, average thrust and burn time are
-;the same as the averaged static test data on the NAR web site in
-;the certification file. The curve drawn with these data points is as
-;close to the certification curve as can be with such a limited
-;number of points (32) allowed with wRASP up to v1.6.
-B4 18 70 2-4 0.006 0.0189 Estes 
-0.02 0.418
-0.04 1.673
-0.065 4.076
-0.085 6.69
-0.105 9.304
-0.119 11.496
-0.136 12.75
-0.153 11.916
-0.173 10.666
-0.187 9.304
-0.198 7.214
-0.207 5.645
-0.226 4.809
-0.258 4.182
-0.326 3.763
-0.422 3.554
-0.549 3.345
-0.665 3.345
-0.776 3.345
-0.863 3.345
-0.94 3.449
-0.991 3.449
-1.002 2.404
-1.01 1.254
-1.03 0
+; B4-4
+B4-4 18 70 P 0.006 0.0195 E
+   0.058 2.361
+   0.102 2.921
+   0.122 3.797
+   0.15 5.866
+   0.18 8.373
+   0.199 9.882
+   0.208 10.88
+   0.216 11.367
+   0.238 11.245
+   0.245 10.832
+   0.262 8.982
+   0.293 6.134
+   0.322 5.306
+   0.357 4.917
+   0.388 4.795
+   0.416 4.746
+   0.46 4.625
+   0.502 4.576
+   0.544 4.357
+   0.575 4.503
+   0.605 4.527
+   0.674 4.552
+   0.731 4.454
+   0.88 4.454
+   0.915 4.503
+   0.96 4.406
+   1.0 4.065
+   1.047 2.556
+   1.049 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4_1.eng
new file mode 100644
index 000000000..64b099809
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4_1.eng
@@ -0,0 +1,34 @@
+;
+;Estes B4 RASP.ENG file made from NAR published data
+;File produced October 3, 2000
+;The total impulse, peak thrust, average thrust and burn time are
+;the same as the averaged static test data on the NAR web site in
+;the certification file. The curve drawn with these data points is as
+;close to the certification curve as can be with such a limited
+;number of points (32) allowed with wRASP up to v1.6.
+B4 18 70 2-4 0.006 0.0189 Estes 
+0.02 0.418
+0.04 1.673
+0.065 4.076
+0.085 6.69
+0.105 9.304
+0.119 11.496
+0.136 12.75
+0.153 11.916
+0.173 10.666
+0.187 9.304
+0.198 7.214
+0.207 5.645
+0.226 4.809
+0.258 4.182
+0.326 3.763
+0.422 3.554
+0.549 3.345
+0.665 3.345
+0.776 3.345
+0.863 3.345
+0.94 3.449
+0.991 3.449
+1.002 2.404
+1.01 1.254
+1.03 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.eng
index f7cf3a389..1d704125b 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.eng
@@ -1,33 +1,23 @@
-;
-;Estes C6 RASP.ENG file made from NAR published data
-;File produced October 3, 2000
-;The total impulse, peak thrust, average thrust and burn time are
-;the same as the averaged static test data on the NAR web site in
-;the certification file. The curve drawn with these data points is as
-;close to the certification curve as can be with such a limited
-;number of points (32) allowed with wRASP up to v1.6.
-C6 18 70 0-3-5-7 0.0108 0.0231 Estes 
-0.031 0.946
-0.092 4.826
-0.139 9.936
-0.192 14.09
-0.209 11.446
-0.231 7.381
-0.248 6.151
-0.292 5.489
-0.37 4.921
-0.475 4.448
-0.671 4.258
-0.702 4.542
-0.723 4.164
-0.85 4.448
-1.063 4.353
-1.211 4.353
-1.242 4.069
-1.303 4.258
-1.468 4.353
-1.656 4.448
-1.821 4.448
-1.834 2.933
-1.847 1.325
-1.86 0
+; C6-0
+C6-0 18 70 P 0.012480000000000002 0.0227 E
+   0.014 0.633
+   0.026 1.533
+   0.067 2.726
+   0.099 5.136
+   0.15 9.103
+   0.183 11.465
+   0.207 11.635
+   0.219 11.391
+   0.262 6.377
+   0.333 5.014
+   0.349 5.209
+   0.392 4.722
+   0.475 4.771
+   0.653 4.746
+   0.913 4.673
+   1.366 4.625
+   1.607 4.625
+   1.745 4.868
+   1.978 4.795
+   2.023 0.828
+   2.024 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6_1.eng
new file mode 100644
index 000000000..f7cf3a389
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6_1.eng
@@ -0,0 +1,33 @@
+;
+;Estes C6 RASP.ENG file made from NAR published data
+;File produced October 3, 2000
+;The total impulse, peak thrust, average thrust and burn time are
+;the same as the averaged static test data on the NAR web site in
+;the certification file. The curve drawn with these data points is as
+;close to the certification curve as can be with such a limited
+;number of points (32) allowed with wRASP up to v1.6.
+C6 18 70 0-3-5-7 0.0108 0.0231 Estes 
+0.031 0.946
+0.092 4.826
+0.139 9.936
+0.192 14.09
+0.209 11.446
+0.231 7.381
+0.248 6.151
+0.292 5.489
+0.37 4.921
+0.475 4.448
+0.671 4.258
+0.702 4.542
+0.723 4.164
+0.85 4.448
+1.063 4.353
+1.211 4.353
+1.242 4.069
+1.303 4.258
+1.468 4.353
+1.656 4.448
+1.821 4.448
+1.834 2.933
+1.847 1.325
+1.86 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L1112.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L1112.eng
new file mode 100644
index 000000000..caa9206f7
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L1112.eng
@@ -0,0 +1,30 @@
+L1112BT 75 497.8 P 1.8 3.628 Gorilla
+   0.05 1131.791
+   0.071 1174.3
+   0.113 1176.957
+   0.176 1211.495
+   0.263 1293.855
+   0.397 1145.075
+   0.493 1129.134
+   0.786 1182.27
+   1.062 1254.003
+   1.078 1232.749
+   1.229 1275.258
+   1.308 1254.003
+   1.492 1283.228
+   2.002 1293.855
+   2.236 1299.169
+   2.345 1283.228
+   2.545 1227.435
+   2.608 1198.211
+   2.688 1190.24
+   2.759 1206.181
+   2.809 1168.986
+   2.884 892.68
+   2.922 672.167
+   3.009 504.789
+   3.223 225.827
+   3.26 108.928
+   3.331 37.195
+   3.44 5.314
+   3.595 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1952.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1952.eng
new file mode 100644
index 000000000..6e50c9ab6
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1952.eng
@@ -0,0 +1,33 @@
+M1952BT 75 784.9 P 2.97 5.4430000000000005 Gorilla
+   0.025 1639.097
+   0.033 2397.644
+   0.046 2100.59
+   0.075 2519.648
+   0.096 2599.215
+   0.104 2689.392
+   0.187 2689.392
+   0.228 2620.434
+   0.274 2445.384
+   0.316 2328.685
+   0.403 2275.64
+   0.523 2291.553
+   1.001 2339.294
+   1.188 2344.598
+   1.499 2328.685
+   1.637 2302.162
+   1.794 2270.335
+   2.093 2238.508
+   2.193 2206.681
+   2.243 2143.027
+   2.368 1777.015
+   2.505 1310.217
+   2.525 1241.258
+   2.584 1220.04
+   2.609 1119.254
+   2.663 960.118
+   2.733 763.851
+   2.8 567.584
+   2.87 413.753
+   2.987 238.703
+   3.178 63.654
+   3.41 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J1026.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J1026.eng
new file mode 100644
index 000000000..f75d90f6d
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J1026.eng
@@ -0,0 +1,27 @@
+J1026 38 625.5 P 0.616 1.172 Loki
+   0.019 62.798
+   0.034 795.446
+   0.045 1167.004
+   0.07 1182.703
+   0.149 1153.921
+   0.249 1146.071
+   0.4 1161.77
+   0.49 1185.32
+   0.6 1193.17
+   0.8 1180.087
+   0.851 1172.237
+   0.899 1169.62
+   0.922 1159.154
+   0.947 1167.004
+   0.979 1127.755
+   1.009 1067.573
+   1.089 669.85
+   1.13 486.688
+   1.142 468.371
+   1.151 408.19
+   1.161 316.609
+   1.176 222.411
+   1.201 128.213
+   1.227 65.415
+   1.264 26.166
+   1.297 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K1127.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K1127.eng
new file mode 100644
index 000000000..0bba56b34
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K1127.eng
@@ -0,0 +1,37 @@
+K1127LB 38 625.5 P 0.624 1.172 Loki
+   0.009 77.978
+   0.021 1002.962
+   0.033 1368.654
+   0.045 1210.008
+   0.058 1365.965
+   0.067 1263.786
+   0.08 1360.587
+   0.092 1255.719
+   0.105 1331.009
+   0.117 1242.275
+   0.13 1312.186
+   0.142 1261.097
+   0.155 1304.12
+   0.167 1261.097
+   0.218 1290.675
+   0.395 1325.631
+   0.542 1368.654
+   0.689 1392.854
+   0.726 1382.098
+   0.755 1344.453
+   0.814 1110.518
+   0.867 949.184
+   0.874 1099.763
+   0.883 962.629
+   0.908 847.006
+   0.989 548.537
+   0.997 363.002
+   1.003 715.249
+   1.014 494.759
+   1.048 406.025
+   1.091 352.247
+   1.152 228.557
+   1.198 158.645
+   1.244 69.912
+   1.286 32.267
+   1.37 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K527.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K527.eng
new file mode 100644
index 000000000..2c72ae37a
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K527.eng
@@ -0,0 +1,27 @@
+K527LR 54 492.1 P 1.0150000000000001 1.973 Loki
+   0.023 87.866
+   0.051 624.477
+   0.06 701.36
+   0.079 759.414
+   0.125 707.636
+   0.176 682.531
+   0.269 654.288
+   0.501 649.581
+   1.01 644.874
+   1.265 640.167
+   1.52 646.443
+   1.701 643.305
+   2.035 618.201
+   2.526 567.991
+   2.827 539.749
+   2.943 530.335
+   2.999 513.075
+   3.04 442.468
+   3.115 356.171
+   3.309 219.665
+   3.481 91.004
+   3.546 59.623
+   3.652 43.933
+   3.791 37.657
+   3.967 10.983
+   4.129 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L840.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L840.eng
new file mode 100644
index 000000000..334227464
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L840.eng
@@ -0,0 +1,25 @@
+L840CT 75 498 P 2.074 3.748 Loki
+   0.021 889.644
+   0.046 1182.485
+   0.077 1082.4
+   0.139 978.608
+   0.303 971.195
+   0.662 1015.677
+   1.011 1108.348
+   1.33 1149.124
+   1.689 1189.899
+   1.971 1163.951
+   2.089 1145.417
+   2.3 1034.211
+   2.633 893.351
+   2.823 822.921
+   3.455 656.112
+   3.737 596.803
+   3.891 585.682
+   3.984 385.512
+   4.112 355.858
+   4.215 203.877
+   4.292 140.86
+   4.384 103.792
+   4.589 63.016
+   4.8 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1650.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1650.eng
new file mode 100644
index 000000000..8f2702872
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1650.eng
@@ -0,0 +1,22 @@
+M1650LC 76 784.2 P 3.23 5.63 Loki
+   0.015 1912.965
+   0.046 3779.835
+   0.097 3149.862
+   0.132 2865.606
+   0.183 2642.811
+   0.295 2458.429
+   0.407 2350.873
+   0.509 2297.095
+   0.91 2097.347
+   1.495 1920.648
+   1.612 1882.235
+   2.772 1336.771
+   3.266 1044.832
+   3.342 960.324
+   3.398 860.45
+   3.505 798.989
+   3.606 629.972
+   3.81 361.082
+   3.901 238.16
+   4.008 153.652
+   4.613 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1969.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1969.eng
new file mode 100644
index 000000000..7d3c852a3
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1969.eng
@@ -0,0 +1,28 @@
+M1969SF 75 1038 P 4.266 7.189 Loki
+   0.036 263.323
+   0.044 1504.064
+   0.075 2204.77
+   0.087 2356.515
+   0.186 2204.77
+   0.23 2280.643
+   0.274 2240.475
+   0.503 2347.589
+   1.003 2432.388
+   1.058 2454.703
+   1.495 2307.421
+   2.002 2236.012
+   2.315 2186.918
+   2.501 2182.454
+   2.628 2169.065
+   2.815 2244.938
+   2.882 2191.381
+   3.045 1338.929
+   3.096 1142.553
+   3.164 1044.365
+   3.267 964.029
+   3.378 807.821
+   3.5 504.33
+   3.639 267.786
+   3.77 102.651
+   3.881 22.315
+   3.96 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M3464.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M3464.eng
new file mode 100644
index 000000000..71a7a19e4
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M3464.eng
@@ -0,0 +1,25 @@
+M3400LB 76 1038.2 P 4.464 7.597 Loki
+   0.007 4907.495
+   0.02 4008.216
+   0.047 3866.9
+   0.35 3866.9
+   0.502 3866.9
+   0.579 3892.594
+   1.239 4277.999
+   1.808 4303.693
+   1.886 4303.693
+   1.919 4188.071
+   2.0 3404.414
+   2.064 2916.234
+   2.152 2569.369
+   2.242 2569.369
+   2.283 2440.901
+   2.347 1965.567
+   2.384 1541.621
+   2.434 1104.829
+   2.485 835.045
+   2.545 719.423
+   2.596 475.333
+   2.717 205.55
+   2.862 51.387
+   2.976 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx.eng
new file mode 100644
index 000000000..0caf9294c
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx.eng
@@ -0,0 +1,35 @@
+; @File: q003.txt, @Pts-I: 769, @Pts-O: 31, @Sm: 0, @CO: 0%
+; @TI: 0.1991613, @TIa: 0.1991608, @TIe: +0.1%, @ThMax: 1.624927, @ThAvg: 0.255335, @Tb: 0.78
+; Exported using ThrustCurveTool, www.ThrustGear.com
+MAXXII 0 0 0.76 0.0 0.0 QUEST
+ 0.026 0.0394607
+ 0.036 0.1214556
+ 0.04 0.206028
+ 0.05 0.444676
+ 0.056 0.680251
+ 0.06 0.899565
+ 0.066 1.358816
+ 0.068 1.475611
+ 0.07 1.56653
+ 0.074 1.624927
+ 0.088 1.190166
+ 0.112 0.830955
+ 0.126 0.439917
+ 0.134 0.319751
+ 0.144 0.248959
+ 0.174 0.1656754
+ 0.206 0.1918503
+ 0.258 0.1262147
+ 0.342 0.1601231
+ 0.366 0.1386081
+ 0.384 0.1794569
+ 0.494 0.218422
+ 0.546 0.1540751
+ 0.56 0.178168
+ 0.608 0.1523896
+ 0.682 0.209499
+ 0.698 0.1837202
+ 0.712 0.220206
+ 0.742 0.209003
+ 0.768 0.040353
+ 0.785 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_1.eng
new file mode 100644
index 000000000..5ea10d96a
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_1.eng
@@ -0,0 +1,35 @@
+; @File: q0016.txt, @Pts-I: 815, @Pts-O: 31, @Sm: 0, @CO: 3%
+; @TI: 0.1497473, @TIa: 0.1488623, @TIe: -0.06%, @ThMax: 2.09889, @ThAvg: 0.1862529, @Tb: 0.804
+; Exported using ThrustCurveTool, www.ThrustGear.com
+1/8A0.2 0 0 0.81 0.0 0.0 QUEST
+ 0.016 0.0530363
+ 0.02 0.0985533
+ 0.024 0.176654
+ 0.03 0.415869 
+ 0.032 0.434918
+ 0.038 0.657991
+ 0.052 1.247306
+ 0.058 1.453536
+ 0.064 1.700872
+ 0.066 1.755612
+ 0.07 1.951716
+ 0.074 2.06541
+ 0.076 2.09889
+ 0.078 2.09889
+ 0.08 2.02811
+ 0.082 1.911814
+ 0.084 1.619262
+ 0.086 1.151861
+ 0.088 0.728272
+ 0.09 0.433614
+ 0.092 0.292953
+ 0.098 0.217459
+ 0.154 0.224377
+ 0.172 0.150186
+ 0.196 0.0998567
+ 0.23 0.078602
+ 0.414 0.0625608
+ 0.7559 0.082111
+ 0.8219 0.0607562
+ 0.8339 0.0208536
+0.834 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_1.rse
new file mode 100644
index 000000000..2fe681673
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_1.rse
@@ -0,0 +1,49 @@
+<engine-database>
+ <engine-list>
+<engine FDiv="10" FFix="1" FStep="-1." Isp="60.9" Itot="0.299" Type="single-use" auto-calc-cg="1" auto-calc-mass="1" avgThrust="0.452" burn-time="0.66" cgDiv="10" cgFix="1" cgStep="-1." code="Micro Maxx II" delays="1" dia="6." exitDia="0." initWt="1.2" len="26." mDiv="10" mFix="1" mStep="-1." massFrac="41.67" mfg="Quest" peakThrust="3.21" propWt="0.5" tDiv="10" tFix="1" tStep="-1." throatDia="0.">
+  <comments>QUEST MICROMAXX II RASP.ENG file made from NAR published data
+File produced Dec 29, 2001
+The total impulse, peak thrust, average thrust and burn time are
+the same as the averaged static test data on the NAR web site in
+the certification file. The curve drawn with these data points is as
+close to the certification curve as can be with such a limited
+number of points (32) allowed with wRASP up to v1.6.
+</comments>
+  <data>
+    <eng-data cg="13." f="0." m="0.5" t="0."/>
+    <eng-data cg="13." f="0.16" m="0.498928" t="0.008"/>
+    <eng-data cg="13." f="0.482" m="0.493554" t="0.018"/>
+    <eng-data cg="13." f="0.993" m="0.486144" t="0.024"/>
+    <eng-data cg="13." f="1.534" m="0.473451" t="0.03"/>
+    <eng-data cg="13." f="2.032" m="0.461509" t="0.034"/>
+    <eng-data cg="13." f="2.397" m="0.454093" t="0.036"/>
+    <eng-data cg="13." f="2.543" m="0.43755" t="0.04"/>
+    <eng-data cg="13." f="3.025" m="0.40958" t="0.046"/>
+    <eng-data cg="13." f="3.21" m="0.37826" t="0.052"/>
+    <eng-data cg="13." f="2.864" m="0.342664" t="0.059"/>
+    <eng-data cg="13." f="2.191" m="0.300344" t="0.069"/>
+    <eng-data cg="13." f="1.094" m="0.270091" t="0.08"/>
+    <eng-data cg="13." f="0.539" m="0.260521" t="0.087"/>
+    <eng-data cg="13." f="0.378" m="0.256683" t="0.092"/>
+    <eng-data cg="13." f="0.304" m="0.248689" t="0.106"/>
+    <eng-data cg="13." f="0.26" m="0.233107" t="0.139"/>
+    <eng-data cg="13." f="0.303" m="0.215196" t="0.177"/>
+    <eng-data cg="13." f="0.287" m="0.192474" t="0.223"/>
+    <eng-data cg="13." f="0.243" m="0.176944" t="0.258"/>
+    <eng-data cg="13." f="0.198" m="0.165868" t="0.288"/>
+    <eng-data cg="13." f="0.27" m="0.143143" t="0.346"/>
+    <eng-data cg="13." f="0.298" m="0.116513" t="0.402"/>
+    <eng-data cg="13." f="0.254" m="0.112354" t="0.411"/>
+    <eng-data cg="13." f="0.312" m="0.10335" t="0.43"/>
+    <eng-data cg="13." f="0.282" m="0.0859449" t="0.465"/>
+    <eng-data cg="13." f="0.238" m="0.0694017" t="0.503"/>
+    <eng-data cg="13." f="0.281" m="0.0637531" t="0.516"/>
+    <eng-data cg="13." f="0.28" m="0.0421482" t="0.562"/>
+    <eng-data cg="13." f="0.294" m="0.0137954" t="0.621"/>
+    <eng-data cg="13." f="0.279" m="0.00420109" t="0.641"/>
+    <eng-data cg="13." f="0.176" m="0.00191552" t="0.647"/>
+    <eng-data cg="13." f="0." m="-0." t="0.66"/>
+  </data>
+</engine>
+ </engine-list>
+</engine-database>
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_2.eng
new file mode 100644
index 000000000..8ed80b4b4
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_2.eng
@@ -0,0 +1,39 @@
+; Traced from NAR certification data dated 1-29-2009
+MicroMaxxII 6 26 NE-1 5.0E-4 0.0010 Q
+   0.021 0.015
+   0.036 0.05
+   0.043 0.103
+   0.049 0.198
+   0.08 1.636
+   0.092 1.3
+   0.109 0.995
+   0.124 0.805
+   0.133 0.442
+   0.143 0.301
+   0.164 0.21
+   0.186 0.149
+   0.199 0.183
+   0.235 0.145
+   0.256 0.145
+   0.293 0.149
+   0.327 0.164
+   0.367 0.156
+   0.387 0.175
+   0.409 0.183
+   0.431 0.191
+   0.461 0.21
+   0.474 0.202
+   0.49 0.217
+   0.505 0.175
+   0.513 0.198
+   0.537 0.172
+   0.553 0.175
+   0.602 0.156
+   0.623 0.175
+   0.644 0.183
+   0.674 0.21
+   0.689 0.191
+   0.697 0.229
+   0.731 0.21
+   0.753 0.092
+   0.771 0.0
diff --git a/core/resources/datafiles/thrustcurves/thrustcurves.ser b/core/resources/datafiles/thrustcurves/thrustcurves.ser
index f9226e989..4f447a542 100644
Binary files a/core/resources/datafiles/thrustcurves/thrustcurves.ser and b/core/resources/datafiles/thrustcurves/thrustcurves.ser differ