diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.eng
index 0df93f6e0..7e7714271 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.eng
@@ -1,37 +1,37 @@
-; 136 N-sec G80, Certified Nov. 2007. As published by NAR S&T.
+;G80 New Blue Thunder
+G80NBT 29 123.825 4-7-10 0.069 0.129 AT 
+0.013 89.054
+0.018 101.584
+0.029 105.388
+0.047 102.927
+0.104 100.018
+0.19 102.255
+0.268 104.94
+0.306 104.269
+0.352 105.835
+0.41 104.94
+0.432 106.73
+0.512 105.612
+0.563 106.954
+0.591 104.493
+0.62 106.283
+0.715 103.15
+0.76 103.374
+0.806 101.36
+0.848 102.032
+1.2 88.383
+1.243 77.866
+1.269 57.952
+1.302 44.079
+1.329 34.011
+1.367 26.403
+1.398 22.823
+1.433 20.585
+1.48 21.704
+1.508 20.809
+1.584 13.201
+1.604 11.635
+1.652 11.188
+1.683 5.37
+1.701 0
 ;
-; @File: NewATG80.txt, @Pts-I: 905, @Pts-O: 31, @Sm: 0, @CO: 5%
-; @TI: 133.2377, @TIa: 133.1309, @TIe: 0.0%, @ThMax: 102.2, @ThAvg: 77.9911, @Tb: 1.707
-; Exported using ThrustCurveTool, www.ThrustGear.com
-G78 29 128 7,10,13 0.0625 0.1282 RCS/Aerotech
-0.0060 1.158086
-0.0080 7.48984
-0.01 33.7575
-0.012 64.5955
-0.014 62.9316
-0.016 58.8272
-0.018 74.9118
-0.02 85.0062
-0.022 91.1072
-0.026 93.9913
-0.028 98.4284
-0.032 97.652
-0.038 102.2
-0.074 97.3192
-0.124 95.4334
-0.376 99.3159
-0.68 99.4268
-0.994 91.6619
-1.2459 83.0095
-1.2819 77.3522
-1.3159 61.9332
-1.3599 44.6285
-1.4239 29.0986
-1.5039 21.2227
-1.5979 19.33693
-1.6559 16.34188
-1.6759 13.90147
-1.6779 11.79384
-1.7139 5.0938
-1.7339 1.388816
-1.8079 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_1.eng
index 37179e0df..0df93f6e0 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_1.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_1.eng
@@ -1,28 +1,37 @@
-; AEROTECH G80 RASP.ENG FILE
-; Note: this is for the 94 N-sec G80T certified in Sept. 2006
-G80 29 124 4-7-10 0.0479 0.1129998 AERO
-  0.0060     84.371
-  0.018      118.23
-  0.027      109.378
-  0.037      101.35
-  0.042      105.565
-  0.059      98.37
-  0.113      95.821
-  0.185      96.252
-  0.277      94.556
-  0.404      94.978
-  0.526      91.165
-  0.671      87.1
-  0.792      82.675
-  0.885      77.166
-  0.943      73.353
-  0.971      68.266
-  0.997      57.237
-  1.03       48.337
-  1.059      40.279
-  1.085      27.986
-  1.112      17.811
-  1.144      10.175
-  1.168      5.512
-  1.182      2.968
-  1.21       0.0
+; 136 N-sec G80, Certified Nov. 2007. As published by NAR S&T.
+;
+; @File: NewATG80.txt, @Pts-I: 905, @Pts-O: 31, @Sm: 0, @CO: 5%
+; @TI: 133.2377, @TIa: 133.1309, @TIe: 0.0%, @ThMax: 102.2, @ThAvg: 77.9911, @Tb: 1.707
+; Exported using ThrustCurveTool, www.ThrustGear.com
+G78 29 128 7,10,13 0.0625 0.1282 RCS/Aerotech
+0.0060 1.158086
+0.0080 7.48984
+0.01 33.7575
+0.012 64.5955
+0.014 62.9316
+0.016 58.8272
+0.018 74.9118
+0.02 85.0062
+0.022 91.1072
+0.026 93.9913
+0.028 98.4284
+0.032 97.652
+0.038 102.2
+0.074 97.3192
+0.124 95.4334
+0.376 99.3159
+0.68 99.4268
+0.994 91.6619
+1.2459 83.0095
+1.2819 77.3522
+1.3159 61.9332
+1.3599 44.6285
+1.4239 29.0986
+1.5039 21.2227
+1.5979 19.33693
+1.6559 16.34188
+1.6759 13.90147
+1.6779 11.79384
+1.7139 5.0938
+1.7339 1.388816
+1.8079 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_2.eng
index 794363221..37179e0df 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_2.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_2.eng
@@ -1,34 +1,28 @@
-; Aerotech G80 RASP.ENG file made from NAR published data
-; File produced July 4, 2000
-; Note: This is for the 116N-sec G80T produced before Sept. 2006
-G80 29 124 4-7-10 0.0574 0.1049 A
-  0.0060     101.291
-  0.013      105.18
-  0.031      103.473
-  0.038      104.069
-  0.067      99.803
-  0.103      96.906
-  0.181      94.733
-  0.271      94.039
-  0.303      96.985
-  0.367      95.547
-  0.428      94.842
-  0.456      97.055
-  0.463      92.65
-  0.51       94.872
-  0.596      93.444
-  0.606      95.646
-  0.624      91.985
-  0.635      95.656
-  0.646      91.995
-  0.696      90.547
-  0.846      85.477
-  0.96       80.388
-  1.071      74.564
-  1.207      62.878
-  1.296      52.639
-  1.35       37.252
-  1.382      20.397
-  1.418      10.139
-  1.457      4.281
-  1.5        0.0
+; AEROTECH G80 RASP.ENG FILE
+; Note: this is for the 94 N-sec G80T certified in Sept. 2006
+G80 29 124 4-7-10 0.0479 0.1129998 AERO
+  0.0060     84.371
+  0.018      118.23
+  0.027      109.378
+  0.037      101.35
+  0.042      105.565
+  0.059      98.37
+  0.113      95.821
+  0.185      96.252
+  0.277      94.556
+  0.404      94.978
+  0.526      91.165
+  0.671      87.1
+  0.792      82.675
+  0.885      77.166
+  0.943      73.353
+  0.971      68.266
+  0.997      57.237
+  1.03       48.337
+  1.059      40.279
+  1.085      27.986
+  1.112      17.811
+  1.144      10.175
+  1.168      5.512
+  1.182      2.968
+  1.21       0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_3.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_3.eng
new file mode 100644
index 000000000..794363221
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_3.eng
@@ -0,0 +1,34 @@
+; Aerotech G80 RASP.ENG file made from NAR published data
+; File produced July 4, 2000
+; Note: This is for the 116N-sec G80T produced before Sept. 2006
+G80 29 124 4-7-10 0.0574 0.1049 A
+  0.0060     101.291
+  0.013      105.18
+  0.031      103.473
+  0.038      104.069
+  0.067      99.803
+  0.103      96.906
+  0.181      94.733
+  0.271      94.039
+  0.303      96.985
+  0.367      95.547
+  0.428      94.842
+  0.456      97.055
+  0.463      92.65
+  0.51       94.872
+  0.596      93.444
+  0.606      95.646
+  0.624      91.985
+  0.635      95.656
+  0.646      91.995
+  0.696      90.547
+  0.846      85.477
+  0.96       80.388
+  1.071      74.564
+  1.207      62.878
+  1.296      52.639
+  1.35       37.252
+  1.382      20.397
+  1.418      10.139
+  1.457      4.281
+  1.5        0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H195.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H195.eng
new file mode 100644
index 000000000..207df719f
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H195.eng
@@ -0,0 +1,24 @@
+H195NBT 29 203.2 10 0.115 0.197 AT
+   0.003 178.052
+   0.005 224.131
+   0.013 252.516
+   0.019 256.571
+   0.022 248.461
+   0.058 239.614
+   0.1 240.351
+   0.199 235.559
+   0.255 228.555
+   0.285 227.449
+   0.301 230.767
+   0.399 223.025
+   0.5 223.025
+   0.603 220.445
+   0.774 217.127
+   0.802 211.598
+   0.899 201.644
+   0.961 180.632
+   0.999 169.942
+   1.023 161.094
+   1.054 155.196
+   1.101 69.304
+   1.169 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I140.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I140.eng
new file mode 100644
index 000000000..4d9e0012e
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I140.eng
@@ -0,0 +1,25 @@
+; AT I140W DMS
+I140W 38 202.7 14-12-10-8-6 0.183 0.356 AT
+   0.011 96.257
+   0.024 80.214
+   0.049 160.428
+   0.062 144.02
+   0.114 160.428
+   0.159 164.074
+   0.238 174.647
+   0.314 173.918
+   0.419 179.023
+   0.627 178.293
+   0.835 176.835
+   0.943 177.2
+   1.146 164.803
+   1.349 148.76
+   1.459 141.103
+   1.562 131.259
+   1.773 113.393
+   2.192 83.86
+   2.295 67.088
+   2.395 37.555
+   2.435 31.356
+   2.47 20.418
+   2.478 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I280.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I280.eng
new file mode 100644
index 000000000..6d7af43e4
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I280.eng
@@ -0,0 +1,34 @@
+; I280DM DMS
+I280DM 38 356.4 14-12-10-8-6 0.355 0.616 AT
+   0.016 342.389
+   0.048 297.021
+   0.111 316.16
+   0.173 328.211
+   0.202 327.502
+   0.261 322.54
+   0.334 311.907
+   0.498 310.489
+   0.602 308.363
+   0.705 307.654
+   0.802 310.489
+   0.902 310.489
+   1.0 306.236
+   1.025 316.869
+   1.057 309.072
+   1.1 308.363
+   1.139 317.578
+   1.205 307.654
+   1.298 304.109
+   1.336 316.16
+   1.4 299.856
+   1.5 296.312
+   1.55 298.438
+   1.595 306.945
+   1.634 295.603
+   1.652 280.716
+   1.716 253.07
+   1.743 224.006
+   1.8 153.827
+   1.9 62.381
+   1.97 20.558
+   1.971 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J270.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J270.eng
new file mode 100644
index 000000000..901f65876
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J270.eng
@@ -0,0 +1,40 @@
+; J270W DMS
+J270W 38 356.4 14-12-10-8-6 0.381 0.642 AT
+   0.007 367.585
+   0.02 325.124
+   0.074 353.027
+   0.136 329.977
+   0.176 343.928
+   0.273 324.518
+   0.33 342.715
+   0.357 326.338
+   0.399 330.584
+   0.473 310.567
+   0.553 325.731
+   0.734 340.895
+   0.744 357.273
+   0.761 315.419
+   0.788 337.256
+   0.897 340.895
+   1.009 333.617
+   1.053 354.24
+   1.105 320.878
+   1.18 345.748
+   1.214 321.485
+   1.249 345.748
+   1.274 314.206
+   1.5 316.026
+   1.601 309.96
+   1.916 303.894
+   1.956 265.073
+   2.0 214.121
+   2.052 179.546
+   2.102 158.923
+   2.201 117.676
+   2.268 106.151
+   2.303 87.953
+   2.369 55.805
+   2.407 49.739
+   2.486 39.427
+   2.558 21.837
+   2.563 0.0
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 6bc79404d..a3e98ccd3 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng
@@ -1,42 +1,37 @@
-; 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
+; 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
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 42b6beb7a..6bc79404d 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,23 +1,42 @@
-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
+; 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_M685.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M685.eng
index c105bb8bf..bc2dc5ecf 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M685.eng
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M685.eng
@@ -1,5 +1,5 @@
 ; M685W-PS Moonburner
-M685W-PS 75 801 P 4.32 7.008 AT
+M685W-PS 75 936 P 4.32 7.008 AT
    0.083 1333.469
    0.13 1368.376
    0.249 1361.395
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G145.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G145.eng
new file mode 100644
index 000000000..8154cbdb6
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G145.eng
@@ -0,0 +1,15 @@
+;
+; Pro24-6G 140G145-PK Pink
+;based on RockSim file by Mark Koelsch
+G145-PK 24 228 0 0.0772 0.1619 CTI
+0.007 286.726
+0.013 346.018
+0.022 310.619
+0.039 226.991
+0.066 206.097
+0.343 174.779
+0.672 138.496
+0.775 75.664
+0.899 29.204
+0.982 13.274
+1.015 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1830.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1830.eng
new file mode 100644
index 000000000..5a5cbf679
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1830.eng
@@ -0,0 +1,14 @@
+;
+; Pro75-4G 5604M1830-CS C-Star
+;based on RockSim file by Mark Koelsch
+M1830-CS 75 621 0 2.666 4.524 CTI
+   0.018 2300.79
+   0.028 1952.86
+   0.155 2008.98
+   1.111 2121.21
+   1.452 2053.87
+   1.782 1958.47
+   2.608 1694.72
+   2.677 1546.02
+   3.06 115.039
+   3.165 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2200.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2200.eng
new file mode 100644
index 000000000..862106491
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2200.eng
@@ -0,0 +1,16 @@
+;
+; Pro98-5G 12066N2200-PK Pink
+;based on RockSim file by Mark Koelsch
+N2200-PK 98 1010 0 6.308 11.356 CTI
+0.033 2755.85
+0.143 2434.78
+0.624 2555.18
+1.814 2602.01
+2.67 2461.54
+4.186 2130.43
+4.66 2063.55
+4.796 1852.84
+5.067 775.92
+5.236 474.916
+5.497 180.602
+5.86 0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2900.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2900.rse
new file mode 100644
index 000000000..04e27bdba
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2900.rse
@@ -0,0 +1,30 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="N2900-CL" Type="unspecified" dia="98." len="1239."
+initWt="14166." propWt="8788." delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="2818.38" peakThrust="4022.13" throatDia="0." exitDia="0."
+Itot="17744.5" burn-time="6.3" massFrac="62.04" Isp="205.9" 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>Pro98-6GXL 17613N2900-CL P</comments>
+    <data>
+      <eng-data  t="0." f="0." m="8788." cg="619.5"/>
+      <eng-data  t="0.026" f="1863.57" m="8776." cg="619.5"/>
+      <eng-data  t="0.074" f="3605.4" m="8711." cg="619.5"/>
+      <eng-data  t="0.122" f="4022.13" m="8620.34" cg="619.5"/>
+      <eng-data  t="0.361" f="3619.45" m="8168.09" cg="619.5"/>
+      <eng-data  t="1.18" f="3497.71" m="6724.69" cg="619.5"/>
+      <eng-data  t="1.981" f="3586.67" m="5319.51" cg="619.5"/>
+      <eng-data  t="3.493" f="3155.89" m="2795.02" cg="619.5"/>
+      <eng-data  t="4.648" f="2874.95" m="1070.15" cg="619.5"/>
+      <eng-data  t="4.939" f="2322.44" m="695.633" cg="619.5"/>
+      <eng-data  t="5.205" f="1648.18" m="434.094" cg="619.5"/>
+      <eng-data  t="5.629" f="945.832" m="161.739" cg="619.5"/>
+      <eng-data  t="5.972" f="430.775" m="44.8158" cg="619.5"/>
+      <eng-data  t="6.219" f="206.023" m="5.86692" cg="619.5"/>
+      <eng-data  t="6.278" f="149.835" m="0.667855" cg="619.5"/>
+      <eng-data  t="6.296" f="0." m="0." cg="619.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5600.eng
new file mode 100644
index 000000000..aa1f4783a
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5600.eng
@@ -0,0 +1,23 @@
+N5600WT 98 1010 P 6.363 11.28 CTI
+   0.019 6750.0
+   0.041 6250.0
+   0.044 6078.947
+   0.077 5960.526
+   0.198 6144.737
+   0.749 6328.947
+   0.931 6447.368
+   1.049 6368.421
+   1.25 6118.421
+   1.501 5828.947
+   1.751 5500.0
+   1.999 5263.158
+   2.131 5131.579
+   2.17 5144.737
+   2.2 4986.842
+   2.252 4013.158
+   2.291 3013.158
+   2.335 2000.0
+   2.373 1000.0
+   2.401 500.0
+   2.448 171.053
+   2.483 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5600.rse
new file mode 100644
index 000000000..52da96e92
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5600.rse
@@ -0,0 +1,27 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="13628-N5600-WT-P" Type="unspecified" dia="98." len="1010."
+initWt="11280." propWt="6486." delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="5538.49" peakThrust="6592.69" throatDia="0." exitDia="0."
+Itot="13635.8" burn-time="2.46" massFrac="57.5" Isp="214.38" 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 Pro-98 6G
+13628 N5600-WT P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="6486." cg="505."/>
+      <eng-data  t="0.024" f="6592.69" m="6448.37" cg="505."/>
+      <eng-data  t="0.064" f="5986.47" m="6328.7" cg="505."/>
+      <eng-data  t="0.309" f="6213.8" m="5617.81" cg="505."/>
+      <eng-data  t="0.806" f="6376.18" m="4129.65" cg="505."/>
+      <eng-data  t="0.921" f="6451.96" m="3778.8" cg="505."/>
+      <eng-data  t="2.14" f="5131.26" m="420.646" cg="505."/>
+      <eng-data  t="2.186" f="5109.61" m="308.609" cg="505."/>
+      <eng-data  t="2.215" f="4849.8" m="239.918" cg="505."/>
+      <eng-data  t="2.38" f="844.384" m="16.4672" cg="505."/>
+      <eng-data  t="2.462" f="0." m="0." cg="505."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E16.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E16.eng
new file mode 100644
index 000000000..268857831
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E16.eng
@@ -0,0 +1,36 @@
+; File produced, 2013
+; 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.
+E16 29 114 0-4-6-8 .0400 .08200 E
+0.150 1.371
+0.186 1.920
+0.206 3.387
+0.242 5.587
+0.252 7.422
+0.277 8.705
+0.333 13.474
+0.359 15.858
+0.374 16.592
+0.394 18.609
+0.435 21.544
+0.476 24.661
+0.521 26.440
+0.643 21.720
+0.725 20.432
+0.821 19.511
+0.898 18.958
+1.025 18.219
+1.142 18.032
+1.259 17.844
+1.396 17.472
+1.569 17.282
+1.757 17.275
+1.895 17.086
+2.027 17.816
+2.042 12.494
+2.052 8.457
+2.063 4.970
+2.090 0.000
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F15.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F15.eng
new file mode 100644
index 000000000..25af6df38
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F15.eng
@@ -0,0 +1,34 @@
+; Estes F15 RASP.ENG file made from NAR published data
+; File produced, 2013
+; 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.
+F15 29 114 0-4-6-8 .0600 .10300 E
+0.148 7.638
+0.228 12.253
+0.294 16.391
+0.353 20.210
+0.382 22.756
+0.419 25.260
+0.477 23.074
+0.520 20.845
+0.593 19.093
+0.688 17.500
+0.855 16.225
+1.037 15.427
+1.205 14.948
+1.423 14.627
+1.452 15.741
+1.503 14.785
+1.736 14.623
+1.955 14.303
+2.210 14.141
+2.494 13.819
+2.763 13.338
+3.120 13.334
+3.382 13.013
+3.404 9.352
+3.418 4.895
+3.450 0.000
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F15_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F15_1.eng
new file mode 100644
index 000000000..300636236
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F15_1.eng
@@ -0,0 +1,31 @@
+; Estes F15 RASP.ENG file made from NAR published data
+; File produced by Howard Smart 7/1/2013
+;The data in the PDF file on the NAR website as of today is incorrect
+;It is a copy-paste of the data for the Estes E16 data - a simple error
+;I made this data file as an approximation of the curve that they display 
+;in the PDF file, which appears to be correct
+;
+F15 29 114 0-2-4-6 0.06 0.103 E
+0.063 2.127
+0.118 4.407
+0.158 8.359
+0.228 13.68
+0.340 20.82
+0.386 26.75
+0.425 25.38
+0.481 22.19
+0.583 17.93
+0.883 16.11
+1.191 14.59
+1.364 15.35
+1.569 15.65
+1.727 14.74
+2.00 14.28
+2.39 13.68
+2.68 13.08
+2.96 13.07
+3.25 13.05
+3.35 13.0
+3.39 7.30
+3.40 0.00
+;
diff --git a/core/resources/datafiles/thrustcurves/thrustcurves.ser b/core/resources/datafiles/thrustcurves/thrustcurves.ser
index 061d74654..c7c589781 100644
Binary files a/core/resources/datafiles/thrustcurves/thrustcurves.ser and b/core/resources/datafiles/thrustcurves/thrustcurves.ser differ