diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d1a988ae..4f48bbeaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ Attention: The newest changes should be on top -->
 
 ### Added
 
+- ENH: create a dataset of pre-registered motors. See #664 [#744](https://github.com/RocketPy-Team/RocketPy/pull/744)
 - DOC: add Defiance flight example [#742](https://github.com/RocketPy-Team/RocketPy/pull/742)
 - ENH: Allow for Alternative and Custom ODE Solvers. [#748](https://github.com/RocketPy-Team/RocketPy/pull/748)
 
@@ -45,6 +46,7 @@ Attention: The newest changes should be on top -->
 
 ## [v1.7.1] - 2024-12-07
 
+
 ### Changed
 
 - REL: update version to 1.7.1 in configuration files [#750](https://github.com/RocketPy-Team/RocketPy/pull/750)
diff --git a/data/motors/aerotech/AeroTech_HP-L1000W.eng b/data/motors/aerotech/AeroTech_HP-L1000W.eng
new file mode 100644
index 000000000..dda619657
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_HP-L1000W.eng
@@ -0,0 +1,26 @@
+; per AT announcement 5/8/14
+L1000 54 635 18 1.4000000000000001 2.194 AT
+   0.004 10.664
+   0.011 1268.961
+   0.04 1322.279
+   0.195 1226.307
+   0.249 1268.961
+   0.296 1242.303
+   0.372 1252.966
+   0.416 1215.644
+   0.6 1226.307
+   0.788 1215.644
+   1.066 1183.653
+   1.261 1167.658
+   1.507 1125.004
+   1.746 1087.681
+   1.865 1050.359
+   1.995 1045.027
+   2.093 911.733
+   2.158 746.448
+   2.263 554.504
+   2.389 405.215
+   2.577 191.944
+   2.693 85.308
+   2.761 42.654
+   3.0 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_K1000T.eng b/data/motors/aerotech/AeroTech_K1000T.eng
new file mode 100644
index 000000000..96df8f4f3
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_K1000T.eng
@@ -0,0 +1,36 @@
+; Based on AT Instruction Sheet by C. Kobel  3/17/2010
+K1000T-P 75 396 P 1.182 2.575 AT
+   0.0040 895.149
+   0.015 1119.762
+   0.025 1093.337
+   0.095 1096.640
+   0.200 1109.853
+   0.300 1116.459
+   0.400 1123.065
+   0.500 1132.975
+   0.600 1139.581
+   0.700 1136.278
+   0.800 1136.278
+   0.900 1136.278
+   1.000 1139.581
+   1.100 1132.975
+   1.200 1129.672
+   1.300 1126.369
+   1.400 1119.762
+   1.500 1109.853
+   1.600 1096.640
+   1.700 1063.609
+   1.800 1017.365
+   1.900 971.121
+   2.000 914.968
+   2.100 868.724
+   2.180 865.421
+   2.200 878.634
+   2.218 858.815
+   2.269 670.536
+   2.300 578.048
+   2.332 445.923
+   2.356 336.920
+   2.389 224.613
+   2.436 105.7
+   2.500 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_K400C.eng b/data/motors/aerotech/AeroTech_K400C.eng
new file mode 100644
index 000000000..f651455d0
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_K400C.eng
@@ -0,0 +1,25 @@
+; Aerotech K400C DMS
+K400C 54 359 14 0.493 1.194 AT
+   0.008 376.374
+   0.025 526.181
+   0.034 548.466
+   0.063 500.182
+   0.178 527.419
+   0.394 522.467
+   0.69 502.658
+   1.003 487.801
+   1.494 446.944
+   2.002 402.374
+   2.243 377.612
+   2.501 363.994
+   2.658 354.089
+   2.772 337.994
+   2.844 304.566
+   2.882 268.662
+   2.929 177.044
+   2.963 116.379
+   3.001 99.046
+   3.064 94.094
+   3.123 61.904
+   3.208 18.571
+   3.259 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_K480W.eng b/data/motors/aerotech/AeroTech_K480W.eng
new file mode 100644
index 000000000..40034b3fd
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_K480W.eng
@@ -0,0 +1,44 @@
+; From AT Instruction Sheet by C. Kobel 3/12/10
+K480W-P 54 568 P 1.232 2.059 AT
+   0.030 535.684
+   0.045 860.341
+   0.057 915.996
+   0.098 830.194
+   0.159 832.513
+   0.246 795.409
+   0.307 811.642
+   0.398 793.090
+   0.492 809.323
+   0.557 823.237
+   0.621 811.642
+   0.689 779.176
+   0.735 795.409
+   0.845 767.581
+   0.989 718.883
+   1.091 707.288
+   1.250 684.098
+   1.307 667.865
+   1.500 653.952
+   1.606 656.271
+   1.742 651.633
+   1.909 628.443
+   2.000 605.253
+   2.250 586.701
+   2.500 565.830
+   2.750 547.279
+   2.886 544.960
+   3.000 524.089
+   3.064 491.623
+   3.144 417.416
+   3.250 394.226
+   3.292 338.571
+   3.451 271.320
+   3.500 231.898
+   3.625 178.561
+   3.700 143.777
+   3.871 132.182
+   4.000 88.121
+   4.133 41.742
+   4.246 23.190
+   4.500 18.552
+   4.800 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_K990DM.eng b/data/motors/aerotech/AeroTech_K990DM.eng
new file mode 100644
index 000000000..095eb4a5c
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_K990DM.eng
@@ -0,0 +1,34 @@
+; Aerotech K990DM 54/2800
+K990DM 54 598 14 1.224 2.109 AT
+   0.016 35.558
+   0.024 223.805
+   0.028 868.03
+   0.036 1068.828
+   0.044 895.222
+   0.048 863.847
+   0.06 840.839
+   0.228 966.337
+   0.286 953.788
+   0.369 964.246
+   0.407 993.529
+   0.423 976.796
+   0.498 989.345
+   0.694 1024.903
+   0.865 1043.728
+   0.962 1054.186
+   1.117 1054.186
+   1.282 1029.087
+   1.51 983.071
+   1.589 960.063
+   1.688 953.788
+   1.732 968.429
+   1.748 1001.895
+   1.778 957.971
+   1.802 891.038
+   1.857 671.416
+   1.913 447.611
+   1.97 223.805
+   2.006 129.682
+   2.063 46.016
+   2.097 14.641
+   2.137 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_L1040DM.eng b/data/motors/aerotech/AeroTech_L1040DM.eng
new file mode 100644
index 000000000..79993221e
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_L1040DM.eng
@@ -0,0 +1,29 @@
+; L1040 Dark Matter
+L1040DM-P 75 681 P 2.602 4.7170000000000005 AT
+   0.018 1126.167
+   0.042 1036.413
+   0.053 1002.543
+   0.116 988.995
+   0.504 1049.961
+   0.794 1095.685
+   1.002 1146.489
+   1.252 1192.213
+   1.499 1237.937
+   1.753 1261.646
+   1.912 1268.42
+   2.095 1254.872
+   2.511 1134.635
+   2.772 1056.734
+   3.012 966.98
+   3.153 933.11
+   3.217 863.677
+   3.291 817.953
+   3.34 758.681
+   3.488 438.613
+   3.552 284.505
+   3.598 220.153
+   3.657 167.655
+   3.746 118.544
+   3.88 42.337
+   3.996 6.774
+   4.127 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_L1940X.eng b/data/motors/aerotech/AeroTech_L1940X.eng
new file mode 100644
index 000000000..5e25c985b
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_L1940X.eng
@@ -0,0 +1,22 @@
+; from TMT document and posted thrust curve
+L1940X 75 560.4 P 1.8234317999999998 3.855515 AT
+   0.02 48.137
+   0.04 2107.333
+   0.055 2289.184
+   0.073 2150.122
+   0.156 2101.985
+   0.397 2150.122
+   0.691 2155.47
+   0.982 2118.03
+   1.41 2000.362
+   1.696 1898.739
+   1.935 1839.905
+   2.06 1818.511
+   2.103 1652.705
+   2.116 1374.58
+   2.133 935.998
+   2.163 534.856
+   2.214 240.685
+   2.244 112.32
+   2.296 5.349
+   2.309 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_L2200G.eng b/data/motors/aerotech/AeroTech_L2200G.eng
new file mode 100644
index 000000000..c3021f949
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_L2200G.eng
@@ -0,0 +1,39 @@
+; Curvefit of Aerotech Instructions by C. Kobel  11/19/08
+L2200G 75 665 0-6-10-14-18 2.516 4.751 AT
+   0.011 1195.177
+   0.024 2029.903
+   0.037 2380.868
+   0.050 2542.122
+   0.100 2570.578
+   0.150 2561.093
+   0.200 2523.151
+   0.250 2485.208
+   0.300 2523.151
+   0.350 2570.578
+   0.400 2674.919
+   0.500 2912.057
+   0.600 3073.311
+   0.700 3073.311
+   0.800 3101.768
+   0.900 3092.282
+   1.000 3092.282
+   1.100 2959.485
+   1.186 2807.716
+   1.227 2437.781
+   1.270 2257.556
+   1.300 2162.701
+   1.400 1991.961
+   1.500 1878.135
+   1.600 1792.765
+   1.700 1688.424
+   1.800 1612.54
+   1.900 1584.083
+   2.000 1536.656
+   2.048 1498.714
+   2.084 1403.858
+   2.102 1166.72
+   2.134 796.784
+   2.186 455.305
+   2.237 237.138
+   2.300 94.855
+   2.400 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_L2775ST-PS.eng b/data/motors/aerotech/AeroTech_L2775ST-PS.eng
new file mode 100644
index 000000000..ebd57c388
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_L2775ST-PS.eng
@@ -0,0 +1,151 @@
+; AT L2775ST 75-3840
+; from TMT certification document
+; created by John Junghans 2024-04-22
+L2775ST 75 558.2 P 1.418 3.479 AT
+0.01064 3.54001
+0.02242 72.44425
+0.02606 344.23136
+0.02793 580.45024
+0.02933 832.91856
+0.03027 1025.50464
+0.03120 1215.68340
+0.03213 1404.65850
+0.03307 1592.42994
+0.03400 1778.99771
+0.03500 1923.43727
+0.03634 2129.56457
+0.03821 2348.33032
+0.04008 2488.85798
+0.04391 2604.83092
+0.05082 2637.24199
+0.06110 2576.86217
+0.07215 2544.82832
+0.08165 2539.27505
+0.09193 2553.55487
+0.10221 2566.19333
+0.11249 2572.26636
+0.12277 2591.63439
+0.13304 2603.12390
+0.14332 2603.12390
+0.15360 2602.79563
+0.16388 2618.88095
+0.17415 2647.76886
+0.18443 2663.36177
+0.19471 2672.88165
+0.20499 2686.66906
+0.21527 2691.92141
+0.22554 2696.35308
+0.23582 2705.38055
+0.24610 2725.07686
+0.25638 2746.08625
+0.26665 2745.42970
+0.27693 2744.77316
+0.28721 2757.73989
+0.29749 2774.15348
+0.30777 2784.49404
+0.31804 2795.49114
+0.32832 2808.95028
+0.33860 2813.54609
+0.34888 2810.75578
+0.35915 2810.91992
+0.36943 2825.69214
+0.37971 2841.44919
+0.38999 2838.16647
+0.40027 2843.91122
+0.41054 2841.61332
+0.42082 2843.58295
+0.43110 2848.34289
+0.44138 2854.90833
+0.45165 2864.75648
+0.46193 2870.66537
+0.47221 2872.79914
+0.48249 2878.05149
+0.49277 2885.27346
+0.50304 2895.61402
+0.51332 2904.47736
+0.52360 2913.17656
+0.53388 2919.90613
+0.54415 2920.23440
+0.55443 2919.57786
+0.56471 2927.45638
+0.57499 2939.93071
+0.58527 2947.15269
+0.59554 2951.91263
+0.60582 2956.50843
+0.61610 2958.47806
+0.62638 2957.82152
+0.63665 2963.73041
+0.64693 2973.08615
+0.65721 2977.35369
+0.66749 2976.69714
+0.67777 2980.30813
+0.68804 2979.32332
+0.69832 2977.84609
+0.70860 2979.32332
+0.71888 2987.53011
+0.72915 2991.79764
+0.73943 2988.67906
+0.74971 2989.49974
+0.75999 2997.37826
+0.77027 3003.61543
+0.78054 3004.76438
+0.79082 3006.07746
+0.80110 3007.88296
+0.81138 3009.52432
+0.82165 3003.94370
+0.83193 3006.24160
+0.84221 3013.62771
+0.85249 3015.92562
+0.86277 3019.20833
+0.87304 3015.76148
+0.88332 3017.40284
+0.89360 3017.40284
+0.90388 3017.07457
+0.91415 3020.68556
+0.92443 3023.96827
+0.93471 3021.67037
+0.94499 3021.99864
+0.95527 3027.41513
+0.96554 3030.69784
+0.97582 3033.98056
+0.98610 3041.36668
+0.99638 3046.29075
+1.00665 3048.58865
+1.01693 3047.60384
+1.02721 3056.63131
+1.03749 3068.77737
+1.04777 3076.32762
+1.05804 3081.74410
+1.06832 3069.76218
+1.07533 3028.39994
+1.08127 2938.89900
+1.08645 2838.10081
+1.09028 2736.81257
+1.09308 2631.19114
+1.09588 2509.77163
+1.09775 2424.91339
+1.09962 2334.18728
+1.10149 2233.53096
+1.10345 2137.93002
+1.10523 2030.41282
+1.10640 1933.36749
+1.10896 1827.74606
+1.11083 1735.66584
+1.11270 1649.90485
+1.11457 1567.75484
+1.11831 1444.68030
+1.12205 1345.67901
+1.12569 1255.40428
+1.12952 1162.42131
+1.13326 1078.01444
+1.13699 990.89933
+1.14073 900.62460
+1.14354 809.74804
+1.14727 701.41837
+1.15101 585.56580
+1.15475 469.41232
+1.15858 362.76777
+1.16316 260.57678
+1.16816 173.39719
+1.17717 79.42549
+1.18944 14.35612
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M1075DM.eng b/data/motors/aerotech/AeroTech_M1075DM.eng
new file mode 100644
index 000000000..30d03e3c6
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M1075DM.eng
@@ -0,0 +1,24 @@
+; M1075 Dark Matter
+M1075DM 98 597 P 3.846 6.971 AT
+   0.02 927.501
+   0.112 988.073
+   0.26 1033.501
+   0.53 1080.823
+   0.897 1124.359
+   1.509 1198.18
+   1.998 1239.823
+   2.355 1260.644
+   2.503 1264.43
+   2.773 1237.93
+   2.997 1222.787
+   3.502 1162.216
+   4.001 1063.787
+   4.501 906.68
+   4.741 834.751
+   4.878 742.001
+   4.96 664.394
+   5.062 448.608
+   5.164 223.357
+   5.26 79.5
+   5.352 30.286
+   5.5 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M1305M.eng b/data/motors/aerotech/AeroTech_M1305M.eng
new file mode 100644
index 000000000..4e4b71b8b
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M1305M.eng
@@ -0,0 +1,31 @@
+; M1305 Metalstorm
+M1305M 98 597 P 4.08 7.098 AT
+   0.016 1288.076
+   0.043 1462.78
+   0.08 1370.986
+   0.407 1622.679
+   0.535 1640.446
+   0.787 1705.59
+   0.985 1693.745
+   1.13 1717.434
+   1.328 1693.745
+   1.349 1927.672
+   1.397 1726.317
+   1.751 1711.512
+   2.018 1687.823
+   2.275 1690.784
+   2.297 1892.139
+   2.318 1678.94
+   2.929 1412.441
+   3.748 1113.371
+   4.24 906.095
+   4.503 802.456
+   4.717 663.285
+   4.813 538.919
+   4.92 387.903
+   5.027 245.771
+   5.166 145.094
+   5.263 79.95
+   5.386 32.572
+   5.498 23.689
+   5.707 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M1340W.eng b/data/motors/aerotech/AeroTech_M1340W.eng
new file mode 100644
index 000000000..9f8f2eb8f
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M1340W.eng
@@ -0,0 +1,28 @@
+; 98 White Lightning DMS
+M1340W 98 557 P 4.0360000000000005 6.998 AT
+   0.016 42.431
+   0.027 1053.712
+   0.043 862.771
+   0.076 1329.516
+   0.098 1403.771
+   0.152 1424.986
+   0.986 1729.078
+   1.154 1810.404
+   1.518 1874.051
+   1.642 1842.228
+   2.0 1888.195
+   2.558 1891.731
+   2.775 1782.117
+   2.818 1707.862
+   2.894 1615.927
+   2.997 1520.457
+   4.0 1011.281
+   4.509 763.764
+   4.862 608.183
+   4.981 583.431
+   5.062 526.856
+   5.149 438.457
+   5.322 226.301
+   5.458 99.006
+   5.577 28.288
+   5.642 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M1845NT.eng b/data/motors/aerotech/AeroTech_M1845NT.eng
new file mode 100644
index 000000000..f56d8fdbd
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M1845NT.eng
@@ -0,0 +1,17 @@
+M1845 98 597 P 3.7720000000000002 6.682 AT
+   0.024 2261.638
+   0.067 2115.94
+   1.032 2268.261
+   1.354 2433.828
+   2.253 2288.129
+   2.406 2149.053
+   2.578 1821.232
+   3.065 1579.504
+   3.583 1410.627
+   3.838 1364.268
+   3.913 1218.569
+   3.995 685.445
+   4.109 400.671
+   4.352 248.35
+   4.498 33.113
+   4.729 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M1939W.eng b/data/motors/aerotech/AeroTech_M1939W.eng
new file mode 100644
index 000000000..947d235c0
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M1939W.eng
@@ -0,0 +1,30 @@
+; AeroTech M1939W
+; converted from TMT test stand data 1998 (www.tripoli.org)
+; provided by ThrustCurve.org (www.thrustcurve.org)
+M1939W 98 732 0 5.656 8.98822 AT
+   0.134 1905.185
+   0.406 2021.155
+   0.679 2095.900
+   0.952 2158.087
+   1.225 2198.211
+   1.498 2219.694
+   1.770 2228.643
+   2.042 2229.881
+   2.315 2225.641
+   2.587 2211.713
+   2.860 2164.724
+   3.133 2047.014
+   3.405 1916.238
+   3.677 1805.664
+   3.950 1658.489
+   4.223 1497.704
+   4.496 1339.452
+   4.769 1213.061
+   5.041 1102.130
+   5.313 966.508
+   5.585 670.253
+   5.858 443.975
+   6.131 155.355
+   6.404 41.358
+   6.677 5.775
+   6.950 0.000
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M2100G.eng b/data/motors/aerotech/AeroTech_M2100G.eng
new file mode 100644
index 000000000..a8685e8c4
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M2100G.eng
@@ -0,0 +1,50 @@
+; Entered by Tim Van Milligan for RockSim Users. Used John Coker's ThrustCurve
+; Tracer software and TRA cert paperwork dated 10-14-08.
+M2100G 98 597 4 4.03 7.03 Aerotech
+   0.014 72.789
+   0.017 1148.45
+   0.021 1552.833
+   0.038 1593.272
+   0.042 1908.691
+   0.052 2062.357
+   0.077 2151.321
+   0.115 2207.935
+   0.167 2240.285
+   0.223 2256.461
+   0.272 2256.461
+   0.31 2232.198
+   0.415 2280.724
+   0.59 2385.863
+   0.701 2410.126
+   0.876 2507.179
+   0.959 2555.705
+   1.043 2588.055
+   1.176 2677.02
+   1.263 2782.159
+   1.333 2830.685
+   1.437 2846.861
+   1.517 2879.211
+   1.608 2968.176
+   1.667 2943.913
+   1.81 2935.825
+   1.926 2895.387
+   1.999 2846.861
+   2.041 2782.159
+   2.152 2531.442
+   2.393 1949.129
+   2.484 1787.376
+   2.56 1674.148
+   2.738 1504.307
+   2.836 1439.606
+   2.958 1366.817
+   3.091 1285.94
+   3.178 1229.326
+   3.23 1196.976
+   3.283 1180.8
+   3.401 1188.888
+   3.447 1140.362
+   3.478 1035.222
+   3.513 913.907
+   3.516 541.874
+   3.527 444.822
+   3.541 0.0
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M650W.eng b/data/motors/aerotech/AeroTech_M650W.eng
new file mode 100644
index 000000000..794ec0f22
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M650W.eng
@@ -0,0 +1,25 @@
+;
+;75-6400 case
+;  Greg Gardner - 10/25/07
+M650W  75 801  0  3.351  5.125  AT
+0.08 1240
+0.12 1328
+0.25 1230
+0.5 1142
+1.0 1071
+1.5 1048
+2.0 1018
+2.5 982
+3.0 950
+3.5 853
+4.0 781
+5.0 595
+6.0 443
+7.0 297
+8.0 155
+9.0 88
+10.0 32
+10.5 12
+11.0 4
+11.5 0
+;
\ No newline at end of file
diff --git a/data/motors/aerotech/AeroTech_M750W.eng b/data/motors/aerotech/AeroTech_M750W.eng
new file mode 100644
index 000000000..a932a0556
--- /dev/null
+++ b/data/motors/aerotech/AeroTech_M750W.eng
@@ -0,0 +1,24 @@
+;
+;98-10240 case
+;  Greg Gardner - 10/25/07
+M750W  98 732  0  5.3  8.776  AT
+0.1 1032
+0.2 992
+0.3 974
+0.48 966
+1.0 1055
+1.5 1152
+2.0 1192
+2.5 1218
+4.0 1103
+6.0 818
+8.0 561
+10.0 318
+11.0 216
+12.0 125
+13.0 76
+14.0 47
+15.0 23
+15.5 9
+16.0 0
+;
\ No newline at end of file
diff --git a/data/motors/animal-motor/AMW_1791K710-P.eng b/data/motors/animal-motor/AMW_1791K710-P.eng
new file mode 100644
index 000000000..c03d69603
--- /dev/null
+++ b/data/motors/animal-motor/AMW_1791K710-P.eng
@@ -0,0 +1,17 @@
+K710-BB 54 491 0 0.902 1.812 AMW/ProX 
+0.01 500
+0.02 850
+0.025 910
+0.03 840
+0.06 860
+0.12 875
+0.2 875
+0.3 872
+1.1 815
+1.85 740
+1.95 720
+2.2 295
+2.37 280
+2.5 90
+2.6 20
+2.8 0
\ No newline at end of file
diff --git a/data/motors/animal-motor/AMW_2245K1075-P.eng b/data/motors/animal-motor/AMW_2245K1075-P.eng
new file mode 100644
index 000000000..ebbb43a5f
--- /dev/null
+++ b/data/motors/animal-motor/AMW_2245K1075-P.eng
@@ -0,0 +1,41 @@
+; AMW 54-2500 Skidmark Plugged
+2245-K1075-SK-P 54 728 P 1.259 2.6388 CTI
+   0.0070 1574.366
+   0.012 1038.184
+   0.017 1476.101
+   0.024 1083.044
+   0.029 1365.02
+   0.034 1117.223
+   0.041 1266.756
+   0.046 1162.083
+   0.049 1226.168
+   0.069 1159.947
+   0.107 1130.04
+   0.151 1108.678
+   0.21 1100.134
+   0.274 1102.27
+   0.332 1102.27
+   0.432 1115.087
+   0.523 1119.359
+   0.611 1132.176
+   0.674 1140.721
+   0.766 1149.266
+   0.881 1159.947
+   0.979 1179.172
+   1.141 1191.989
+   1.257 1189.853
+   1.379 1191.989
+   1.504 1202.67
+   1.599 1211.215
+   1.67 1232.577
+   1.744 1249.666
+   1.772 1226.168
+   1.802 1155.674
+   1.841 993.324
+   1.888 736.983
+   1.944 455.007
+   2.002 267.023
+   2.065 128.171
+   2.11 68.358
+   2.149 34.179
+   2.198 0.0
\ No newline at end of file
diff --git a/data/motors/animal-motor/AMW_2730L1276-P.eng b/data/motors/animal-motor/AMW_2730L1276-P.eng
new file mode 100644
index 000000000..29e0e4262
--- /dev/null
+++ b/data/motors/animal-motor/AMW_2730L1276-P.eng
@@ -0,0 +1,24 @@
+; AMX/ProX 2729L1276 RR
+L1276RR 54 728 P 1.475 2.96 AMW
+   0.015 76.924
+   0.017 692.317
+   0.026 1495.003
+   0.037 1244.164
+   0.052 1401.357
+   0.084 1307.71
+   0.127 1307.71
+   0.181 1367.911
+   0.289 1401.357
+   0.384 1408.046
+   0.807 1421.424
+   0.993 1461.558
+   1.215 1491.659
+   1.673 1474.936
+   1.727 1384.634
+   1.798 1083.627
+   1.947 531.78
+   1.986 351.175
+   2.047 177.26
+   2.092 93.647
+   2.144 33.445
+   2.185 0.0
\ No newline at end of file
diff --git a/data/motors/animal-motor/AMW_4701L1290-P.eng b/data/motors/animal-motor/AMW_4701L1290-P.eng
new file mode 100644
index 000000000..0d813e471
--- /dev/null
+++ b/data/motors/animal-motor/AMW_4701L1290-P.eng
@@ -0,0 +1,21 @@
+; ABC-76-6000 4701L1290-SK P
+L1290-SK 76 785 P 3.047 5.399 CTI
+   0.022 117.623
+   0.081 786.023
+   0.11 797.226
+   0.176 1226.645
+   0.691 1357.337
+   1.231 1461.891
+   1.761 1476.828
+   2.008 1467.493
+   2.311 1417.082
+   2.835 1299.459
+   3.101 1235.98
+   3.167 1230.379
+   3.34 1321.863
+   3.373 1286.39
+   3.532 365.94
+   3.602 201.64
+   3.734 91.485
+   3.782 69.08
+   3.8 0.0
\ No newline at end of file
diff --git a/data/motors/animal-motor/AMW_6774M2050-P.eng b/data/motors/animal-motor/AMW_6774M2050-P.eng
new file mode 100644
index 000000000..4329b9301
--- /dev/null
+++ b/data/motors/animal-motor/AMW_6774M2050-P.eng
@@ -0,0 +1,16 @@
+; AMX75-7600 6774-M2050-SK P
+M2050-BS 75 1039 P 4.172 7.1290000000000004 ABC
+   0.038 2152.81
+   0.833 2506.091
+   1.189 2539.211
+   1.546 2500.571
+   1.775 2415.011
+   1.907 2279.77
+   2.168 2086.569
+   2.401 1973.409
+   2.616 1909.929
+   2.776 1871.288
+   2.918 1203.365
+   3.056 706.563
+   3.309 135.241
+   3.4 0.0
\ No newline at end of file
diff --git a/data/motors/animal-motor/AMW_8212M1630-P.eng b/data/motors/animal-motor/AMW_8212M1630-P.eng
new file mode 100644
index 000000000..cb1d7ce9a
--- /dev/null
+++ b/data/motors/animal-motor/AMW_8212M1630-P.eng
@@ -0,0 +1,19 @@
+; AMW75-7600 8212M1630-TT/DT P
+M1630-TT 75 1039 P 4.349 7.237 CTI
+   0.0030 147.481
+   0.032 2040.948
+   0.078 3235.069
+   0.158 3368.278
+   0.463 3258.856
+   0.647 2992.439
+   0.949 2697.477
+   1.052 2040.948
+   1.101 1883.952
+   1.392 1907.739
+   1.786 1812.59
+   3.6 1327.33
+   3.899 875.372
+   4.595 347.294
+   4.857 195.056
+   4.891 166.511
+   4.9 0.0
\ No newline at end of file
diff --git a/data/motors/animal-motor/AMW_K475.eng b/data/motors/animal-motor/AMW_K475.eng
new file mode 100644
index 000000000..4d2da92b2
--- /dev/null
+++ b/data/motors/animal-motor/AMW_K475.eng
@@ -0,0 +1,37 @@
+; Animal Motor Works K475 RASP.ENG file made from NAR data
+; File produced Feb 22, 2003
+; 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.
+K475 54 403 P 0.7286 1.4925 AW
+0.022 127.831
+0.041 386.016
+0.063 548.326
+0.096 521.308
+0.134 499.129
+0.180 486.830
+0.285 486.830
+0.478 501.649
+0.731 523.727
+1.096 553.266
+1.433 577.962
+1.601 588.290
+1.756 582.704
+1.895 580.284
+1.958 575.344
+2.063 550.746
+2.209 518.788
+2.344 477.051
+2.495 417.974
+2.561 354.058
+2.582 334.399
+2.599 331.980
+2.620 297.501
+2.670 226.226
+2.707 157.370
+2.740 98.353
+2.799 49.176
+2.853 17.208
+2.940 0.000
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_1281K360-13A.eng b/data/motors/cesaroni/Cesaroni_1281K360-13A.eng
new file mode 100644
index 000000000..686574920
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_1281K360-13A.eng
@@ -0,0 +1,13 @@
+; Pro54-3G White 1281-K360
+1281-K360-WH-13A 54 236 13-10-8-6-4 0.747 1.232 CTI
+   0.034 289.25
+   0.077 362.318
+   0.463 387.514
+   1.106 398.6
+   1.564 405.151
+   2.063 398.6
+   2.57 383.483
+   3.101 354.759
+   3.18 343.673
+   3.417 105.319
+   3.5 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_1597K400-14A.eng b/data/motors/cesaroni/Cesaroni_1597K400-14A.eng
new file mode 100644
index 000000000..989c3efa2
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_1597K400-14A.eng
@@ -0,0 +1,12 @@
+; Pro54 4G 1597 K400-GR 14A
+K400-GR 54 404 14-13-12-11-10-9-8-7-6-5-4 0.969 1.5513 CTI
+   0.014 359.164
+   0.102 475.4
+   1.193 444.649
+   2.807 384.994
+   3.364 370.234
+   3.599 363.469
+   3.693 329.028
+   3.859 169.742
+   3.967 57.196
+   4.017 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_1990K490-16A.eng b/data/motors/cesaroni/Cesaroni_1990K490-16A.eng
new file mode 100644
index 000000000..94b397b48
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_1990K490-16A.eng
@@ -0,0 +1,19 @@
+; Pro54-5G 1990K490-GR 16A
+K490-GR 54 488 16-15-14-13-12-11-10-9-8-7-6 1.2012 1.8540999999999999 CTI
+   0.013 445.79
+   0.024 376.662
+   0.083 559.232
+   0.121 584.047
+   0.316 573.412
+   0.727 569.867
+   1.116 553.914
+   1.875 522.009
+   1.893 593.796
+   1.944 519.35
+   2.658 479.468
+   3.063 473.264
+   3.358 444.018
+   3.618 448.449
+   3.894 240.177
+   4.055 31.019
+   4.066 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_2285K260-P.eng b/data/motors/cesaroni/Cesaroni_2285K260-P.eng
new file mode 100644
index 000000000..965b03931
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_2285K260-P.eng
@@ -0,0 +1,18 @@
+; Pro54 6G 2285 K260-CL P
+; Longburn
+K260-CL 54 572 P 1.2413 2.0475 CTI
+   0.042 325.731
+   0.101 430.409
+   0.422 422.807
+   0.773 426.901
+   1.178 429.825
+   1.517 425.731
+   2.011 413.45
+   3.195 356.725
+   4.51 289.474
+   6.015 174.269
+   6.997 91.228
+   7.366 66.667
+   7.902 43.275
+   8.479 25.731
+   8.687 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_2546K300-P.eng b/data/motors/cesaroni/Cesaroni_2546K300-P.eng
new file mode 100644
index 000000000..1e8a6d491
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_2546K300-P.eng
@@ -0,0 +1,21 @@
+;Pro54 6GXL 2546 K300-CL P
+;Longburn
+;Uses a new threaded forward closure
+K300-CL 54 649 0 1.3776 2.27 CTI 
+0.036 495.273
+0.132 543.273
+0.265 506.909
+0.734 493.091
+1.258 489.455
+1.811 482.909
+2.467 453.818
+3.737 375.273
+4.705 299.636
+6.047 165.091
+6.474 120.727
+6.829 90.182
+7.323 63.273
+7.72 46.545
+8.309 30.545
+8.37 0
+;
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_2772L640-P.eng b/data/motors/cesaroni/Cesaroni_2772L640-P.eng
new file mode 100644
index 000000000..7647c61d9
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_2772L640-P.eng
@@ -0,0 +1,16 @@
+L640-DT 54 649 P 1.293 2.244 CTI
+0.02 1200
+0.034 1540
+0.07 1300
+0.15 1460
+0.35 1510
+0.65 1540
+0.7 1510
+0.79 800
+0.86 570.25
+3.26 518
+3.55 330
+3.65 318
+4.15 102
+4.5 30
+5 0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_3147L935-P.eng b/data/motors/cesaroni/Cesaroni_3147L935-P.eng
new file mode 100644
index 000000000..bbbfb1449
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_3147L935-P.eng
@@ -0,0 +1,11 @@
+; Pro54-6GXL 3147L935-IM P
+L935-IM 54 649 P 1.7347000000000001 2.5420000000000003 CTI
+   0.012 1582.739
+   0.052 1365.5
+   0.159 1278.04
+   2.198 990.27
+   2.514 719.427
+   3.021 239.809
+   3.104 160.813
+   3.273 107.209
+   3.3 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_3683L851-P.eng b/data/motors/cesaroni/Cesaroni_3683L851-P.eng
new file mode 100644
index 000000000..fe352ad2b
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_3683L851-P.eng
@@ -0,0 +1,13 @@
+; Pro75-3G White 3683-L851
+3683-L851-WH-P 75 486 P 2.195 3.789 CTI
+   0.059 971.271
+   0.102 855.249
+   0.485 838.674
+   1.353 911.602
+   1.824 980.11
+   3.107 883.978
+   3.68 816.575
+   4.031 732.597
+   4.128 579.006
+   4.256 246.409
+   4.339 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_4263L1350-P.eng b/data/motors/cesaroni/Cesaroni_4263L1350-P.eng
new file mode 100644
index 000000000..37b61ded0
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_4263L1350-P.eng
@@ -0,0 +1,18 @@
+; C-Star 75mm 3G
+; 4263-L1350-CS-P
+4263-L1350-CS-P 75 486 P 2.0245 3.5707 CTI
+   0.016 1421.724
+   0.034 1345.218
+   0.049 1502.479
+   0.081 1415.348
+   0.21 1432.349
+   0.453 1432.349
+   0.809 1462.102
+   1.07 1534.357
+   1.28 1540.732
+   2.661 1283.589
+   2.843 1277.214
+   2.932 1115.702
+   3.037 488.784
+   3.163 82.881
+   3.284 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_4937L395-P.eng b/data/motors/cesaroni/Cesaroni_4937L395-P.eng
new file mode 100644
index 000000000..558b8310f
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_4937L395-P.eng
@@ -0,0 +1,16 @@
+; CTI L395 long burn Mellow Propellant
+; Not many data points.
+; Made from the data in the Rocksim file below
+L395 75 757 P 2.218 5.706 CTI
+0.04 484.229
+0.129 484.229
+0.209 578.734
+0.547 553.644
+2.043 511.828
+7.329 439.068
+8.632 424.014
+9.573 297.73
+11.399 100.358
+12.445 30.108
+12.501 0
+;
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_5472M2250-P.eng b/data/motors/cesaroni/Cesaroni_5472M2250-P.eng
new file mode 100644
index 000000000..215dadd51
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_5472M2250-P.eng
@@ -0,0 +1,19 @@
+; Pro75-4G 5472M2250-CS P
+M2250-CS 75 621 P 2.628 4.415 CTI
+   0.016 2542.114
+   0.051 2390.798
+   0.139 2582.466
+   0.259 2599.278
+   0.877 2663.168
+   1.388 2555.565
+   1.823 2458.05
+   1.86 2303.371
+   1.891 1926.761
+   1.997 1452.637
+   2.195 1452.637
+   2.244 1207.168
+   2.276 645.616
+   2.336 517.838
+   2.414 144.591
+   2.456 40.351
+   2.497 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_6118M3100-P.eng b/data/motors/cesaroni/Cesaroni_6118M3100-P.eng
new file mode 100644
index 000000000..421684f72
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_6118M3100-P.eng
@@ -0,0 +1,17 @@
+; Pro75-5G 6118M3100-WT P
+M3100-WT 75 757 P 2.95 5.018 CTI
+   0.02 3118.031
+   0.057 2976.886
+   0.148 3186.465
+   0.496 3391.768
+   0.817 3665.504
+   0.936 3532.913
+   1.173 3357.551
+   1.501 3199.297
+   1.717 3139.417
+   1.78 2412.304
+   1.812 2130.013
+   1.832 2031.639
+   1.937 346.448
+   1.985 81.266
+   2.0 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_6438M1300-P.eng b/data/motors/cesaroni/Cesaroni_6438M1300-P.eng
new file mode 100644
index 000000000..070293f54
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_6438M1300-P.eng
@@ -0,0 +1,19 @@
+; Pro75-5G 6438M1300-IM/DT P
+M1300-IM 75 757 P 3.595 5.657 CTI
+   0.0090 394.105
+   0.057 934.778
+   0.086 2146.406
+   0.154 2615.423
+   0.314 2827.132
+   0.671 2758.734
+   0.97 2752.22
+   1.082 1172.543
+   1.187 1120.43
+   2.14 1172.543
+   2.7 1139.973
+   3.884 915.235
+   4.372 771.924
+   4.6 400.619
+   4.697 335.478
+   4.9 120.511
+   4.901 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_7388M2045-P.eng b/data/motors/cesaroni/Cesaroni_7388M2045-P.eng
new file mode 100644
index 000000000..cab7c1a1e
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_7388M2045-P.eng
@@ -0,0 +1,18 @@
+; Pro75-6G 7388-M2045-BS P
+M2045-BS 75 893 P 3.739 6.071 CTI
+   0.0040 556.851
+   0.019 1690.324
+   0.063 2359.204
+   0.153 2339.434
+   0.182 2570.083
+   0.247 2471.233
+   0.616 2497.593
+   1.028 2547.018
+   2.111 2316.369
+   2.551 2273.535
+   2.635 2253.765
+   2.796 1696.914
+   3.009 1472.855
+   3.349 247.123
+   3.541 108.734
+   3.587 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_7545M1590-P.eng b/data/motors/cesaroni/Cesaroni_7545M1590-P.eng
new file mode 100644
index 000000000..a989fc005
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_7545M1590-P.eng
@@ -0,0 +1,28 @@
+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
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_8088M1790-P.eng b/data/motors/cesaroni/Cesaroni_8088M1790-P.eng
new file mode 100644
index 000000000..e47847fc7
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_8088M1790-P.eng
@@ -0,0 +1,15 @@
+; Pro98-4G 8088M1790-SK P
+M1790-SK 98 702 P 4.817 8.298 CTI
+   0.059 1791.514
+   0.199 1596.375
+   0.6 1782.109
+   1.215 1913.769
+   1.973 2021.918
+   2.742 1970.195
+   3.387 1833.833
+   3.812 1652.801
+   4.28 1556.407
+   4.385 1295.438
+   4.476 355.011
+   4.541 91.692
+   4.597 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_8634M6400-P.eng b/data/motors/cesaroni/Cesaroni_8634M6400-P.eng
new file mode 100644
index 000000000..89b8ab1ef
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_8634M6400-P.eng
@@ -0,0 +1,15 @@
+; CTI Pro-98 4G
+; 8634 M6400-VM P
+8634-M6400-VM-P 98 702 P 4.308 7.9190000000000005 CTI
+   0.011 6079.636
+   0.135 6598.407
+   0.354 7080.774
+   0.503 7244.596
+   0.713 7162.685
+   0.954 6707.622
+   1.183 5688.282
+   1.233 5460.751
+   1.26 4914.676
+   1.288 3394.767
+   1.331 800.91
+   1.383 0.0
\ No newline at end of file
diff --git a/data/motors/cesaroni/Cesaroni_9977M2245-P.eng b/data/motors/cesaroni/Cesaroni_9977M2245-P.eng
new file mode 100644
index 000000000..d53f3ae9e
--- /dev/null
+++ b/data/motors/cesaroni/Cesaroni_9977M2245-P.eng
@@ -0,0 +1,13 @@
+; Imax Pro75 6GXL
+; 9977 M2245-IM-P
+9977-M2245-IM-P 75 1025 P 5.309 8.182 CTI
+   0.043 3045.655
+   0.136 2629.813
+   1.393 3003.3
+   2.168 3007.151
+   2.708 2972.497
+   2.837 2883.938
+   3.152 1955.996
+   3.397 1409.241
+   3.878 562.156
+   4.371 0.0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_K1127-LB.eng b/data/motors/loki/Loki_K1127-LB.eng
new file mode 100644
index 000000000..5db59403e
--- /dev/null
+++ b/data/motors/loki/Loki_K1127-LB.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
\ No newline at end of file
diff --git a/data/motors/loki/Loki_K350-LW.eng b/data/motors/loki/Loki_K350-LW.eng
new file mode 100644
index 000000000..74b5950e9
--- /dev/null
+++ b/data/motors/loki/Loki_K350-LW.eng
@@ -0,0 +1,24 @@
+;
+;
+K350 54 702 0 1.4 2.54012 Loki
+0.025 1329
+0.0375 1061
+0.1 1006
+0.15 891
+0.2 768
+0.4 571
+0.5 542
+0.75 486
+1 486
+1.25 477
+1.5 481
+2.5058 460
+3.00464 427
+3.5 375
+4 333
+4.5 297
+5 249
+5.5 210
+6 164
+6.5 98
+7 0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_K830-SF.eng b/data/motors/loki/Loki_K830-SF.eng
new file mode 100644
index 000000000..2a1c71d3a
--- /dev/null
+++ b/data/motors/loki/Loki_K830-SF.eng
@@ -0,0 +1,8 @@
+K830-SF 54 726 0 1.4 2.4 Loki 
+0.02 670.185
+0.5 775.726
+1 886.544
+1.5 986.807
+2 1092.35
+2.5 1187.34
+2.7 0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_K960-LW.eng b/data/motors/loki/Loki_K960-LW.eng
new file mode 100644
index 000000000..dfaf2a7de
--- /dev/null
+++ b/data/motors/loki/Loki_K960-LW.eng
@@ -0,0 +1,26 @@
+;
+;
+K960 54 498 0 0.929864 1.74633 Loki 
+0.03 1210
+0.05 1512
+0.075 1535
+0.1 1502
+0.125 1437
+0.2 1237
+0.3 1175
+0.5 1139
+0.6 1130
+0.7 1156
+0.8 1182
+0.9 1192
+1 1166
+1.1 1139
+1.2 1101
+1.3 1091
+1.4 1026
+1.5 839
+1.6 790
+1.7 575
+1.8 284
+1.9 150
+2 0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_L2050LW.eng b/data/motors/loki/Loki_L2050LW.eng
new file mode 100644
index 000000000..7c5f42283
--- /dev/null
+++ b/data/motors/loki/Loki_L2050LW.eng
@@ -0,0 +1,31 @@
+; 54-4000 Loki White
+L2050LW 54 1113.8 P 2.388 4.056 Loki
+   0.027 366.324
+   0.028 137.372
+   0.043 2237.193
+   0.053 2701.64
+   0.074 2786.679
+   0.133 2682.015
+   0.218 2610.059
+   0.324 2708.181
+   0.495 2858.636
+   0.691 3061.422
+   0.87 3172.628
+   0.968 3329.624
+   1.066 3251.126
+   1.125 3139.92
+   1.157 2858.636
+   1.181 2701.64
+   1.213 2616.6
+   1.306 2479.229
+   1.338 2171.778
+   1.41 1962.45
+   1.503 1870.869
+   1.614 1426.047
+   1.753 1020.474
+   1.859 870.02
+   1.997 627.984
+   2.0 667.233
+   2.125 431.739
+   2.316 235.494
+   2.521 0.0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_L780-SF.eng b/data/motors/loki/Loki_L780-SF.eng
new file mode 100644
index 000000000..86146274e
--- /dev/null
+++ b/data/motors/loki/Loki_L780-SF.eng
@@ -0,0 +1,10 @@
+L780-SF 76 498 0 1.8 3.5 Loki 
+0.02 506.596
+0.5 696.57
+1 844.327
+1.5 897.098
+2 934.037
+2.5 918.206
+3 865.435
+3.5 802.111
+3.8 0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_L840CT.eng b/data/motors/loki/Loki_L840CT.eng
new file mode 100644
index 000000000..40d7382ae
--- /dev/null
+++ b/data/motors/loki/Loki_L840CT.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
\ No newline at end of file
diff --git a/data/motors/loki/Loki_L930-LW.eng b/data/motors/loki/Loki_L930-LW.eng
new file mode 100644
index 000000000..ad9e17edf
--- /dev/null
+++ b/data/motors/loki/Loki_L930-LW.eng
@@ -0,0 +1,24 @@
+;
+;
+L930 76 498 0 1.81437 3.53802 Loki
+0.025 532
+0.05 1123
+0.075 1123
+0.125 1094
+0.2 930
+0.5 881
+0.6 878
+0.75 898
+1 921
+1.25 940
+1.5 1012
+1.75 1081
+2 1100
+2.25 1120
+2.5 1051
+2.75 980
+3 934
+3.25 826
+3.5 722
+3.75 280
+4 0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_M1378LR.eng b/data/motors/loki/Loki_M1378LR.eng
new file mode 100644
index 000000000..aea57975d
--- /dev/null
+++ b/data/motors/loki/Loki_M1378LR.eng
@@ -0,0 +1,48 @@
+; Loki M1378LR, 54/4000
+M1378LR 54 1108 P 2.6 4.331 Loki
+   0.033 880.425
+   0.034 1332.161
+   0.035 1783.898
+   0.049 2217.196
+   0.05 2318.606
+   0.065 2240.243
+   0.175 2254.072
+   0.252 2166.491
+   0.386 2097.347
+   0.512 2051.252
+   0.776 2046.642
+   0.939 2065.08
+   0.991 2069.69
+   1.503 2175.71
+   1.568 2207.977
+   1.702 1908.356
+   1.719 1866.87
+   1.788 1857.65
+   1.824 1829.993
+   1.877 1742.412
+   1.902 1747.021
+   1.946 1608.734
+   2.015 1493.496
+   2.076 1447.4
+   2.137 1442.791
+   2.194 1438.181
+   2.239 1405.914
+   2.288 1336.771
+   2.393 1143.169
+   2.499 981.835
+   2.58 871.206
+   2.706 742.138
+   2.775 719.09
+   2.856 686.824
+   3.007 562.366
+   3.202 401.031
+   3.405 267.354
+   3.466 235.087
+   3.527 230.478
+   3.608 184.382
+   3.681 175.163
+   3.783 170.554
+   3.868 129.068
+   3.953 96.801
+   4.022 73.753
+   4.079 0.0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_M1882-LW.eng b/data/motors/loki/Loki_M1882-LW.eng
new file mode 100644
index 000000000..d40135a02
--- /dev/null
+++ b/data/motors/loki/Loki_M1882-LW.eng
@@ -0,0 +1,17 @@
+;
+;
+M1882 75 785 0 3.12979 5.53383 Loki 
+0.01 4.8
+0.0174014 2579.22
+0.0696056 2392.32
+0.232019 2298.87
+0.50464 2261.49
+0.771462 2298.87
+0.986079 2411.01
+1.1891 2579.22
+1.49652 2597.91
+1.72854 2485.77
+2.00116 2354.94
+2.5 1644.72
+2.99884 242.97
+3.25 0
\ No newline at end of file
diff --git a/data/motors/loki/Loki_M1969SF.eng b/data/motors/loki/Loki_M1969SF.eng
new file mode 100644
index 000000000..5b8a46047
--- /dev/null
+++ b/data/motors/loki/Loki_M1969SF.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
\ No newline at end of file
diff --git a/data/motors/loki/Loki_M3000-LW.eng b/data/motors/loki/Loki_M3000-LW.eng
new file mode 100644
index 000000000..66fcb1b45
--- /dev/null
+++ b/data/motors/loki/Loki_M3000-LW.eng
@@ -0,0 +1,27 @@
+;
+M3000-LW 76 1038 P 4.064 6.857 Loki
+0.083333 3234.3980
+0.166666 3626.9781
+0.333333 4104.8876
+0.5 4045.3220
+0.666667 3824.0989
+0.833333 3649.3737
+1.0 3669.9088
+1.166667 3815.3653
+1.333333 3859.8580
+1.5 3781.1602
+1.666667 3626.9781
+1.833333 3434.5774
+2.0 3093.3818
+2.166667 2643.3598
+2.333333 2052.4438
+2.416667 950.4439
+2.5 846.5966
+2.666667 764.3097
+2.833333 718.9958
+2.916667 718.7712
+3.0 542.0856
+3.166667 410.3503
+3.333333 272.3106
+3.5 0
+;
\ No newline at end of file
diff --git a/data/motors/loki/Loki_M3464LB.eng b/data/motors/loki/Loki_M3464LB.eng
new file mode 100644
index 000000000..03e617782
--- /dev/null
+++ b/data/motors/loki/Loki_M3464LB.eng
@@ -0,0 +1,26 @@
+M3464LB 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
+;
\ No newline at end of file