From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Tue, 3 Jan 2012 02:20:10 +0000 (+0000)
Subject: Checkpoint commit of android functionality.  Application currently consists of simple... 
X-Git-Tag: upstream/12.03~1^2~209
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=70b415f6fb474f5d2f146b57272d498ac6f35ea3;p=debian%2Fopenrocket

Checkpoint commit of android functionality.  Application currently consists of simple Main activity which does nothing but allows for bootstrapping of debugger.  In future Main activity will go away.  OpenRocketViewer activity which loads an ork file and displays a list of the simulations.  And Simulation activity which is used to plot simulation results.

Also included is a Motor sqlite database which is populated from thrustcurve downloads.  Includes primitive thrustcurve plotting system.  This will soon be wired into the openrocket application to supply motors for simulation execution.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@261 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/android/.classpath b/android/.classpath
index 996577fd..1f6c7ff4 100644
--- a/android/.classpath
+++ b/android/.classpath
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry excluding="net/sf/openrocket/gui/|net/sf/openrocket/utils/|net/sf/openrocket/file/motor/MotorLoaderHelper.java|net/sf/openrocket/material/MaterialStorage.java|net/sf/openrocket/database/Databases.java" kind="src" path="src"/>
+	<classpathentry excluding="net/sf/openrocket/file/motor/MotorLoaderHelper.java|net/sf/openrocket/gui/|net/sf/openrocket/startup/Startup.java|net/sf/openrocket/startup/Startup2.java|net/sf/openrocket/startup/VersionHelper.java|net/sf/openrocket/utils/|net/sf/openrocket/file/motor/|net/sf/openrocket/file/CSVExport.java" kind="src" path="src"/>
+	<classpathentry kind="src" path="locale"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="lib" path="libs/Androidplot-core-0.4.4-release.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index f1dd120c..1d73587b 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,23 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.openrocket"
+    package="net.sf.openrocket"
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="8" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:debuggable="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-        <activity
-            android:label="@string/app_name"
-            android:name=".OpenRocketSimulation" >
+        android:killAfterRestore="true"
+        android:label="@string/app_name"
+        android:name=".android.Application" >
+        <activity android:name=".android.Main" >
             <intent-filter >
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:label="@string/app_name"
+            android:name=".android.rocket.OpenRocketViewer" >
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.ork"
+                    android:scheme="content" />
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.ork"
+                    android:scheme="file" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".android.PreferencesActivity" >
+            <intent-filter >
+                <action android:name="net.sf.openrocket.android.PreferencesActivity" />
+
+                <category android:name="android.intent.category.PREFERENCE" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:label="@string/MotorListTitle"
+            android:name=".android.motor.MotorHierarchicalBrowser" >
+        </activity>
+        <activity android:name=".android.motor.MotorDetails" />
+        <activity
+            android:label="@string/MotorListTitle"
+            android:name=".android.thrustcurve.TCQueryActivity" >
+        </activity>
+        <activity android:name=".android.simulation.SimulationViewer" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android/libs/Androidplot-core-0.4.4-release.jar b/android/libs/Androidplot-core-0.4.4-release.jar
new file mode 100644
index 00000000..26d119ad
Binary files /dev/null and b/android/libs/Androidplot-core-0.4.4-release.jar differ
diff --git a/android/res/drawable-hdpi/arrow_down_float.png b/android/res/drawable-hdpi/arrow_down_float.png
new file mode 100644
index 00000000..2466c8f6
Binary files /dev/null and b/android/res/drawable-hdpi/arrow_down_float.png differ
diff --git a/android/res/drawable-hdpi/arrow_up_float.png b/android/res/drawable-hdpi/arrow_up_float.png
new file mode 100644
index 00000000..d1301c3b
Binary files /dev/null and b/android/res/drawable-hdpi/arrow_up_float.png differ
diff --git a/android/res/drawable-ldpi/arrow_down_float.png b/android/res/drawable-ldpi/arrow_down_float.png
new file mode 100644
index 00000000..c41340da
Binary files /dev/null and b/android/res/drawable-ldpi/arrow_down_float.png differ
diff --git a/android/res/drawable-ldpi/arrow_up_float.png b/android/res/drawable-ldpi/arrow_up_float.png
new file mode 100644
index 00000000..8b60f121
Binary files /dev/null and b/android/res/drawable-ldpi/arrow_up_float.png differ
diff --git a/android/res/drawable-mdpi/arrow_down_float.png b/android/res/drawable-mdpi/arrow_down_float.png
new file mode 100644
index 00000000..dd825234
Binary files /dev/null and b/android/res/drawable-mdpi/arrow_down_float.png differ
diff --git a/android/res/drawable-mdpi/arrow_up_float.png b/android/res/drawable-mdpi/arrow_up_float.png
new file mode 100644
index 00000000..9bc3d1c2
Binary files /dev/null and b/android/res/drawable-mdpi/arrow_up_float.png differ
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
deleted file mode 100644
index ac9c0aba..00000000
--- a/android/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/hello" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/motor_burn.xml b/android/res/layout/motor_burn.xml
new file mode 100644
index 00000000..5b8e3a1a
--- /dev/null
+++ b/android/res/layout/motor_burn.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.androidplot.xy.XYPlot xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/xyplot"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginLeft="0px"
+    android:layout_marginRight="0px"
+    android:layout_marginTop="5px"
+    title="plot"
+/>
diff --git a/android/res/layout/motor_detail.xml b/android/res/layout/motor_detail.xml
new file mode 100644
index 00000000..b36a44a3
--- /dev/null
+++ b/android/res/layout/motor_detail.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <fragment
+        android:id="@+id/burnPlotFragment"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="0px"
+        android:layout_marginRight="0px"
+        android:layout_marginTop="5px"
+        class="net.sf.openrocket.android.motor.BurnPlotFragment"
+        title="Burn Plot" />
+
+    <SlidingDrawer
+        android:id="@+id/drawer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.4"
+        android:content="@+id/motorDetailForm"
+        android:handle="@+id/handle" >
+
+        <ImageView
+            android:id="@+id/handle"
+            android:layout_width="match_parent"
+            android:layout_height="30px"
+            android:src="@drawable/arrow_up_float"
+            android:text="" />
+
+        <fragment
+            android:id="@+id/motorDetailForm"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            class="net.sf.openrocket.android.motor.MotorDetailsFragment" />
+    </SlidingDrawer>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/android/res/layout/motor_detail_form.xml b/android/res/layout/motor_detail_form.xml
new file mode 100644
index 00000000..45d595d3
--- /dev/null
+++ b/android/res/layout/motor_detail_form.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/motorDetailForm"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black"
+    android:orientation="vertical"
+    android:paddingTop="10px" >
+
+    <TableRow >
+
+        <TextView
+            android:paddingRight="10px"
+            android:text="Manufacturer" />
+
+        <EditText
+            android:id="@+id/motorDetailsManufacturer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.04"
+            android:editable="false" />
+    </TableRow>
+
+    <TableRow >
+
+        <TextView
+            android:paddingRight="10px"
+            android:text="Name" />
+
+        <EditText
+            android:id="@+id/motorDetailsName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.04"
+            android:editable="false" />
+    </TableRow>
+
+    <TableRow >
+
+        <TextView
+            android:paddingRight="10px"
+            android:text="Case Info" />
+
+        <EditText
+            android:id="@+id/motorDetailsCaseInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.04"
+            android:editable="false" />
+    </TableRow>
+
+    <TableRow >
+
+        <TextView
+            android:paddingRight="10px"
+            android:text="Impulse Class" />
+
+        <EditText
+            android:id="@+id/motorDetailsImpuseClass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.04"
+            android:editable="false" />
+    </TableRow>
+
+    <TableRow >
+
+        <TextView
+            android:paddingRight="10px"
+            android:text="Diameter" />
+
+        <EditText
+            android:id="@+id/motorDetailsDiameter"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.04"
+            android:editable="false" />
+    </TableRow>
+
+    <TableRow >
+
+        <TextView
+            android:paddingRight="10px"
+            android:text="Length" />
+
+        <EditText
+            android:id="@+id/motorDetailsLength"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.04"
+            android:editable="false" />
+    </TableRow>
+
+</TableLayout>
\ No newline at end of file
diff --git a/android/res/layout/motor_hierarch_list.xml b/android/res/layout/motor_hierarch_list.xml
new file mode 100644
index 00000000..9d17a2c2
--- /dev/null
+++ b/android/res/layout/motor_hierarch_list.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <ExpandableListView
+        android:id="@+id/motorListView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+    </ExpandableListView>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="No motors" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/motor_list_child.xml b/android/res/layout/motor_list_child.xml
new file mode 100644
index 00000000..0b27002b
--- /dev/null
+++ b/android/res/layout/motor_list_child.xml
@@ -0,0 +1,48 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="45dip"
+    android:gravity="center_vertical"
+    android:orientation="horizontal" >
+
+    <TextView
+        android:id="@+id/motorChildManu"
+        android:layout_width="wrap_content"
+        android:layout_height="45dip"
+        android:layout_alignParentLeft="true"
+        android:gravity="center_vertical"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:textColor="#ffCCCC22"
+        android:textSize="17dip"
+        android:textStyle="bold" >
+    </TextView>
+
+    <TextView
+        android:id="@+id/motorChildName"
+        android:layout_width="wrap_content"
+        android:layout_height="45dip"
+        android:layout_toRightOf="@id/motorChildManu"
+        android:gravity="center_vertical"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:text="Motor Name"
+        android:textColor="#ffCCCC22"
+        android:textSize="17dip"
+        android:textStyle="bold" >
+    </TextView>
+
+    <TextView
+        android:id="@+id/motorChildImpulse"
+        android:layout_width="wrap_content"
+        android:layout_height="45dip"
+        android:layout_alignParentRight="true"
+        android:gravity="center_vertical"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:text="Motor Impulse"
+        android:textColor="#ffCCCC22"
+        android:textSize="17dip"
+        android:textStyle="bold" >
+    </TextView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/motor_list_group.xml b/android/res/layout/motor_list_group.xml
new file mode 100644
index 00000000..a0dbd24d
--- /dev/null
+++ b/android/res/layout/motor_list_group.xml
@@ -0,0 +1,18 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="45dip" >
+
+    <TextView
+        android:id="@+id/motorGroup"
+        android:layout_width="fill_parent"
+        android:layout_height="45dip"
+        android:gravity="center_vertical|right"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:text="motor group"
+        android:textColor="#ffffffff"
+        android:textSize="17dip"
+        android:textStyle="bold" >
+    </TextView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/openrocketviewer.xml b/android/res/layout/openrocketviewer.xml
new file mode 100644
index 00000000..1f024e0b
--- /dev/null
+++ b/android/res/layout/openrocketviewer.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/heading"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Started" />
+
+    <ListView
+        android:id="@+id/rocketSimulations"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/simulation_detail.xml b/android/res/layout/simulation_detail.xml
new file mode 100644
index 00000000..605f4e74
--- /dev/null
+++ b/android/res/layout/simulation_detail.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <fragment
+        android:id="@+id/simulationPlotFragment"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="0px"
+        android:layout_marginRight="0px"
+        android:layout_marginTop="5px"
+        class="net.sf.openrocket.android.simulation.SimulationPlotFragment"
+        title="Simulation" />
+
+    <SlidingDrawer
+        android:id="@+id/drawer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.4"
+        android:content="@+id/simulationConfigurationForm"
+        android:handle="@+id/handle" >
+
+        <ImageView
+            android:id="@+id/handle"
+            android:layout_width="match_parent"
+            android:layout_height="30px"
+            android:src="@drawable/arrow_up_float"
+            android:text="" />
+
+        <TabHost
+            android:id="@+id/simulationConfigurationForm"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@android:color/black" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical" >
+
+                <TabWidget
+                    android:id="@android:id/tabs"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" />
+
+                <FrameLayout
+                    android:id="@android:id/tabcontent"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent" >
+
+                    <ListView
+                        android:id="@+id/simulationEventsList"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <ListView
+                        android:id="@+id/simulationSeriesList"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </FrameLayout>
+            </LinearLayout>
+        </TabHost>
+    </SlidingDrawer>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/android/res/layout/tcqueryform.xml b/android/res/layout/tcqueryform.xml
new file mode 100644
index 00000000..f6fc7c8f
--- /dev/null
+++ b/android/res/layout/tcqueryform.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TableLayout
+        android:id="@+id/tableLayout1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1" >
+
+        <TableRow >
+
+            <TextView
+                android:id="@+id/textView1"
+                android:text="@string/TCMotorSearchFormManufacturer" />
+
+            <Spinner
+                android:id="@+id/TCMotorSearchFormManufacturerField"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/TCMotorSearchManufacturerList" />
+        </TableRow>
+
+        <TableRow >
+
+            <TextView
+                android:id="@+id/textView1"
+                android:text="@string/TCMotorSearchFormImpulse" />
+
+            <Spinner
+                android:id="@+id/TCMotorSearchFormImpulseField"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/TCMotorSearchImpulseList" />
+        </TableRow>
+
+        <TableRow >
+
+            <TextView
+                android:id="@+id/textView1"
+                android:text="@string/TCMotorSearchFormCommonName" />
+
+            <EditText
+                android:id="@+id/TCMotorSearchFormCommonNameField"
+                android:text="" />
+        </TableRow>
+
+        <TableRow >
+
+            <TextView
+                android:id="@+id/textView1"
+                android:text="@string/TCMotorSearchFormDiameter" />
+
+            <Spinner
+                android:id="@+id/TCMotorSearchFormDiameterField"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/TCMotorSearchDiameterList" />
+        </TableRow>
+    </TableLayout>
+
+    <Button
+        android:id="@+id/TCMotorSearchFromSubmitButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerInParent="true"
+        android:text="@string/TCMotorSearchFormSubmit" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/menu/motor_browser_option_menu.xml b/android/res/menu/motor_browser_option_menu.xml
new file mode 100644
index 00000000..5c1f1b44
--- /dev/null
+++ b/android/res/menu/motor_browser_option_menu.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:title="Download from ThrustCurve" android:id="@+id/download_from_thrustcurve_menu_option"/>
+  <item android:title="Preferences" android:id="@+id/preference_menu_option"/>
+</menu>
diff --git a/android/res/menu/motor_details_option_menu.xml b/android/res/menu/motor_details_option_menu.xml
new file mode 100644
index 00000000..c2df357e
--- /dev/null
+++ b/android/res/menu/motor_details_option_menu.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:enabled="true" android:id="@+id/save" android:visible="true" android:title="@string/save"/>
+    
+</menu>
diff --git a/android/res/menu/rocket_viewer_option_menu.xml b/android/res/menu/rocket_viewer_option_menu.xml
new file mode 100644
index 00000000..6d4f5c6f
--- /dev/null
+++ b/android/res/menu/rocket_viewer_option_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  <item android:title="Motor List" android:id="@+id/motor_list_menu_option"/>
+  <item android:title="Preferences" android:id="@+id/preference_menu_option"/>
+    
+
+</menu>
\ No newline at end of file
diff --git a/android/res/menu/simulation_option_menu.xml b/android/res/menu/simulation_option_menu.xml
new file mode 100644
index 00000000..f964fb12
--- /dev/null
+++ b/android/res/menu/simulation_option_menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:title="Select Events" android:id="@+id/simulation_select_events_menu_option"/>
+  <item android:title="Select Series" android:id="@+id/simulation_select_series_menu_option"/>
+  <item android:title="Preferences" android:id="@+id/preference_menu_option"/>
+</menu>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 41bfe9b9..60e3d8fb 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,7 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="hello">Hello World, OpenRocketSimulation!</string>
-    <string name="app_name">OpenRocketSimulation</string>
+    <string name="app_name">OpenRocket</string>
+    <string name="save">Save</string>
+    <string name="MotorListTitle">Motor List</string>
+    <string name="PreferenceMotorBrowserGroupingOption">PreferenceMotorBrowserGroupingOption</string>
+
+    <string-array name="PreferenceMotorBrowserGroupingEntries">
+        <item>Case</item>
+        <item>Diameter</item>
+        <item>Impulse</item>
+        <item>Manufacturer</item>
+    </string-array>
+    <string-array name="PreferenceMotorBrowserGroupingValues">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string name="TCMotorSearchFormImpulse">Impulse</string>
+
+    <string-array name="TCMotorSearchImpulseList">
+        <item>All</item>
+        <item>A</item>
+        <item>B</item>
+        <item>C</item>
+        <item>D</item>
+        <item>E</item>
+        <item>F</item>
+        <item>G</item>
+        <item>H</item>
+        <item>I</item>
+        <item>J</item>
+        <item>K</item>
+        <item>L</item>
+        <item>M</item>
+        <item>N</item>
+        <item>O</item>
+    </string-array>
+
+    <string name="TCMotorSearchFormManufacturer">Manufacturer</string>
+
+    <string-array name="TCMotorSearchManufacturerList">
+        <item>All</item>
+        <item>AeroTech</item>
+        <item>Alpha Hybrids</item>
+        <item>Animal Motor Works</item>
+        <item>Apogee Components</item>
+        <item>Cesaroni Technology</item>
+        <item>Contrail Rockets</item>
+        <item>Ellis Mountain</item>
+        <item>Estes Industries</item>
+        <item>Gorilla Rocket Motors</item>
+        <item>Hypertek</item>
+        <item>Kosdon by AeroTech</item>
+        <item>Kosdon TRM</item>
+        <item>Loki Research</item>
+        <item>Propulsion Polymers</item>
+        <item>Public Missiles, Ltd.</item>
+        <item>Quest Aerospace</item>
+        <item>R.A.T.T. Works</item>
+        <item>Roadrunner Rocketry</item>
+        <item>Rocketvision Flight-Star</item>
+        <item>Sky Ripper Systems</item>
+        <item>West Coast Hybrids</item>
+    </string-array>
+
+    <string name="TCMotorSearchFormCommonName">Common Name</string>
+    <string name="TCMotorSearchFormDiameter">Diameter</string>
+
+    <string-array name="TCMotorSearchDiameterList">
+        <item>All</item>
+        <item>6</item>
+        <item>10.5</item>
+        <item>13</item>
+        <item>18</item>
+        <item>20</item>
+        <item>24</item>
+        <item>29</item>
+        <item>32</item>
+        <item>38</item>
+        <item>54</item>
+        <item>64</item>
+        <item>69</item>
+        <item>75</item>
+        <item>76</item>
+        <item>81</item>
+        <item>98</item>
+        <item>152</item>
+        <item>161</item>
+    </string-array>
+
+    <string name="TCMotorSearchFormSubmit">Submit</string>
+    <string name="tcdownload">Download from ThrustCurve</string>
 
 </resources>
\ No newline at end of file
diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
new file mode 100644
index 00000000..05fc59c8
--- /dev/null
+++ b/android/res/xml/preferences.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  android:key="preferences"
+  android:title="Pref Title"
+  android:summary="pref summary"  
+      
+
+    <ListPreference
+        android:defaultValue="1"
+        android:entries="@array/PreferenceMotorBrowserGroupingEntries"
+        android:entryValues="@array/PreferenceMotorBrowserGroupingValues"
+        android:key="@string/PreferenceMotorBrowserGroupingOption"
+        android:summary="Set the grouping in Motor Browser"
+        android:title="Motor Browser Group" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/net/sf/openrocket/android/Application.java b/src/net/sf/openrocket/android/Application.java
new file mode 100644
index 00000000..61b368c7
--- /dev/null
+++ b/src/net/sf/openrocket/android/Application.java
@@ -0,0 +1,73 @@
+package net.sf.openrocket.android;
+
+import java.util.Locale;
+
+import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
+import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.l10n.DebugTranslator;
+import net.sf.openrocket.l10n.ResourceBundleTranslator;
+import net.sf.openrocket.l10n.Translator;
+
+public class Application extends android.app.Application {
+
+	private OpenRocketDocument rocketDocument;
+	
+	// Big B boolean so I can synchronize on it.
+	private static Boolean initialized = false;
+	
+	public static void initialize() {
+		synchronized (initialized) {
+			if ( initialized == true ) {
+				return;
+			}
+
+			// Android does not have a default sax parser set.  This needs to be defined first.
+			System.setProperty("org.xml.sax.driver","org.xmlpull.v1.sax2.Driver");
+
+			net.sf.openrocket.startup.Application.setLogger( new LogHelper() );
+			
+			net.sf.openrocket.startup.Application.setPreferences( new PreferencesAdapter() );
+			
+			ThrustCurveMotorSetDatabase db = new ThrustCurveMotorSetDatabase(false) {
+				
+				@Override
+				protected void loadMotors() {
+				}
+			};
+			db.startLoading();
+
+			net.sf.openrocket.startup.Application.setMotorSetDatabase(db);
+			
+			Translator t;
+			t = new ResourceBundleTranslator("l10n.messages");
+			if (Locale.getDefault().getLanguage().equals("xx")) {
+				t = new DebugTranslator(t);
+			}
+			
+			net.sf.openrocket.startup.Application.setBaseTranslator(t);
+
+			initialized = true;
+		}
+	}
+
+	public Application() {
+		initialize();
+	}
+
+	/**
+	 * @return the rocketDocument
+	 */
+	public OpenRocketDocument getRocketDocument() {
+		return rocketDocument;
+	}
+
+	/**
+	 * @param rocketDocument the rocketDocument to set
+	 */
+	public void setRocketDocument(OpenRocketDocument rocketDocument) {
+		this.rocketDocument = rocketDocument;
+	}
+	
+	
+	
+}
diff --git a/src/net/sf/openrocket/android/LogHelper.java b/src/net/sf/openrocket/android/LogHelper.java
new file mode 100644
index 00000000..ae10d8b4
--- /dev/null
+++ b/src/net/sf/openrocket/android/LogHelper.java
@@ -0,0 +1,37 @@
+package net.sf.openrocket.android;
+
+import android.util.Log;
+import net.sf.openrocket.logging.LogLevel;
+import net.sf.openrocket.logging.LogLine;
+
+
+public class LogHelper extends net.sf.openrocket.logging.LogHelper {
+
+	/* (non-Javadoc)
+	 * @see net.sf.openrocket.logging.LogHelper#log(net.sf.openrocket.logging.LogLine)
+	 */
+	@Override
+	public void log(LogLine line) {
+		
+		LogLevel level = line.getLevel();
+		
+		switch ( level ) {
+		case ERROR:
+			Log.e("OpenRocket", line.toString());
+			break;
+		case WARN:
+			Log.w("OpenRocket", line.toString());
+			break;
+		case INFO:
+			Log.i("OpenRocket", line.toString());
+			break;
+		case DEBUG:
+			Log.d("OpenRocket", line.toString());
+			break;
+		default:
+			Log.v("OpenRocket", line.toString());
+		}
+	}
+
+	
+}
diff --git a/src/net/sf/openrocket/android/Main.java b/src/net/sf/openrocket/android/Main.java
new file mode 100644
index 00000000..07cfe4ef
--- /dev/null
+++ b/src/net/sf/openrocket/android/Main.java
@@ -0,0 +1,7 @@
+package net.sf.openrocket.android;
+
+import android.app.Activity;
+
+public class Main extends Activity {
+
+}
diff --git a/src/net/sf/openrocket/android/PreferencesActivity.java b/src/net/sf/openrocket/android/PreferencesActivity.java
new file mode 100644
index 00000000..4ce05878
--- /dev/null
+++ b/src/net/sf/openrocket/android/PreferencesActivity.java
@@ -0,0 +1,14 @@
+package net.sf.openrocket.android;
+
+import net.sf.openrocket.R;
+import android.os.Bundle;
+
+public class PreferencesActivity extends android.preference.PreferenceActivity {
+
+	@Override
+	protected void onCreate( Bundle savedInstanceState ) {
+		super.onCreate( savedInstanceState );
+		addPreferencesFromResource(R.xml.preferences);
+	}
+	
+}
diff --git a/src/net/sf/openrocket/android/PreferencesAdapter.java b/src/net/sf/openrocket/android/PreferencesAdapter.java
new file mode 100644
index 00000000..086c18c3
--- /dev/null
+++ b/src/net/sf/openrocket/android/PreferencesAdapter.java
@@ -0,0 +1,96 @@
+package net.sf.openrocket.android;
+
+import java.util.Collections;
+import java.util.Set;
+
+import net.sf.openrocket.material.Material;
+
+public class PreferencesAdapter extends net.sf.openrocket.startup.Preferences {
+
+	@Override
+	public boolean getBoolean(String key, boolean defaultValue) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void putBoolean(String key, boolean value) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public int getInt(String key, int defaultValue) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void putInt(String key, int value) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public double getDouble(String key, double defaultValue) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void putDouble(String key, double value) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public String getString(String key, String defaultValue) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void putString(String key, String value) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public String getString(String directory, String key, String defaultValue) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void putString(String directory, String key, String value) {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see net.sf.openrocket.startup.Preferences#addUserMaterial(net.sf.openrocket.material.Material)
+	 */
+	@Override
+	public void addUserMaterial(Material m) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see net.sf.openrocket.startup.Preferences#getUserMaterials()
+	 */
+	@Override
+	public Set<Material> getUserMaterials() {
+		return Collections.<Material>emptySet();
+	}
+
+	/* (non-Javadoc)
+	 * @see net.sf.openrocket.startup.Preferences#removeUserMaterial(net.sf.openrocket.material.Material)
+	 */
+	@Override
+	public void removeUserMaterial(Material m) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/src/net/sf/openrocket/android/db/DbAdapter.java b/src/net/sf/openrocket/android/db/DbAdapter.java
new file mode 100644
index 00000000..4de12fac
--- /dev/null
+++ b/src/net/sf/openrocket/android/db/DbAdapter.java
@@ -0,0 +1,81 @@
+package net.sf.openrocket.android.db;
+
+import android.content.Context;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+public class DbAdapter {
+
+    private static final String TAG = "DbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+
+    private static final String DATABASE_NAME = "rocketflightnotebook";
+    private static final int DATABASE_VERSION = 5;
+
+    private final Context mCtx;
+
+    private MotorDao motorDao;
+    
+    public MotorDao getMotorDao() {
+		return motorDao;
+	}
+    
+	private class DatabaseHelper extends SQLiteOpenHelper {
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+        	executeSQL( db, MotorDao.create());
+        }
+        
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            executeSQL(db, MotorDao.update(oldVersion, newVersion));
+        }
+
+        private void executeSQL( SQLiteDatabase db, String[] sqls ) {
+        	for(String s: sqls ) {
+        		db.execSQL(s);
+        	}
+        }
+
+    }
+ 
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public DbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public DbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        motorDao = new MotorDao(mDb);
+        return this;
+    }
+
+    public void close() {
+        mDbHelper.close();
+    }
+
+}
\ No newline at end of file
diff --git a/src/net/sf/openrocket/android/db/MotorDao.java b/src/net/sf/openrocket/android/db/MotorDao.java
new file mode 100644
index 00000000..7da2598a
--- /dev/null
+++ b/src/net/sf/openrocket/android/db/MotorDao.java
@@ -0,0 +1,270 @@
+package net.sf.openrocket.android.db;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Vector;
+
+import net.sf.openrocket.android.motor.Motor;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+public class MotorDao {
+
+	private static final String TAG = "MotorDao";
+
+	private SQLiteDatabase mDb;
+
+	private final static String DATABASE_TABLE = "motor";
+	private final static String DROP_TABLE = "DROP TABLE IF EXISTS " + DATABASE_TABLE;
+	private final static String CREATE_TABLE =
+			"create table "+ DATABASE_TABLE + " ( " +
+					"_id integer primary key, "+
+					"unique_name text unique, "+
+					"name text, "+
+					"diameter number, "+
+					"tot_impulse_ns number, "+
+					"avg_thrust_n number, "+
+					"max_thrust_n number, "+
+					"burn_time_s number, "+
+					"length number," +
+					"prop_mass_g number,"+
+					"tot_mass_g number,"+
+					"case_info text,"+
+					"manufacturer text," +
+					"impulse_class text," +
+					"burndata blob"+
+					");";
+
+	MotorDao( SQLiteDatabase mDb ) {
+		this.mDb = mDb;
+	}
+
+	static String[] create() { return new String[] {CREATE_TABLE}; }
+
+	static String[] update( int oldVer, int newVer ) {
+		return new String[] { DROP_TABLE, CREATE_TABLE };
+	}
+
+	public final static String ID = "_id";
+	public final static String UNIQUE_NAME = "unique_name";
+	public final static String NAME = "name";
+	public final static String DIAMETER = "diameter";
+	public final static String TOTAL_IMPULSE = "tot_impulse_ns"; 
+	public final static String AVG_THRUST = "avg_thrust_n";
+	public final static String MAX_THRUST = "max_thrust_n";
+	public final static String BURN_TIME = "burn_time_s";
+	public final static String LENGTH = "length";
+	public final static String PROP_MASS = "prop_mass_g";
+	public final static String TOT_MASS = "tot_mass_g";
+	public final static String BURNDATA = "burndata";
+	public final static String CASE_INFO = "case_info";
+	public final static String MANUFACTURER = "manufacturer";
+	public final static String IMPULSE_CLASS = "impulse_class";
+
+	public long insertOrUpdateMotor(Motor mi) {
+		ContentValues initialValues = new ContentValues();
+		initialValues.put(ID, mi.getMotor_id());
+		initialValues.put(NAME, mi.getName());
+		initialValues.put(DIAMETER,mi.getDiameter());
+		initialValues.put(TOTAL_IMPULSE,mi.getTotalImpulse());
+		initialValues.put(AVG_THRUST,mi.getAvgThrust());
+		initialValues.put(MAX_THRUST,mi.getMaxThrust());
+		initialValues.put(BURN_TIME,mi.getBurnTime());
+		initialValues.put(LENGTH, mi.getLength());
+		initialValues.put(PROP_MASS, mi.getPropMass());
+		initialValues.put(TOT_MASS,mi.getTotMass());
+		initialValues.put(CASE_INFO, mi.getCaseInfo());
+		initialValues.put(MANUFACTURER,mi.getManufacturer());
+		initialValues.put(IMPULSE_CLASS,mi.getImpulseClass());
+		initialValues.put(UNIQUE_NAME, mi.getManufacturer()+mi.getName());
+		{
+			// Serialize the Vector of burn data
+			Vector<Double> burndata = mi.getBurndata();
+			byte[] serObj = null;
+			if ( burndata != null ) {
+				try {
+					ByteArrayOutputStream b = new ByteArrayOutputStream();
+					ObjectOutputStream os = new ObjectOutputStream(b);
+					os.writeObject(burndata);
+					os.close();
+					serObj = b.toByteArray();
+				} catch (Exception ex) {
+					Log.d(TAG,"unable to serialze burndata");
+				}
+			}
+			initialValues.put(BURNDATA, serObj);
+		}
+
+
+		Log.d(TAG,"insertOrUpdate Motor");
+		long rv = mDb.insertWithOnConflict(DATABASE_TABLE, null, initialValues,SQLiteDatabase.CONFLICT_REPLACE);
+		return rv;
+	}
+
+	/**
+	 * Delete the motor and burn data with the given rowId
+	 * 
+	 * @param name name of motor to delete
+	 * @return true if deleted, false otherwise
+	 */
+	public boolean deleteMotor(Long id) {
+
+		boolean rv =  mDb.delete(DATABASE_TABLE, ID + "=" + id, null) > 0;
+		return rv;
+	}
+
+	/**
+	 * 
+	 * @param groupCol
+	 * @param groupVal
+	 * @return
+	 */
+	public Cursor fetchAllInGroups( String groupCol, String groupVal ) {
+		return mDb.query(DATABASE_TABLE, 
+				/* columns */new String[] {
+				ID,
+				NAME,
+				DIAMETER ,
+				TOTAL_IMPULSE,
+				AVG_THRUST ,
+				MAX_THRUST ,
+				BURN_TIME ,
+				LENGTH,
+				PROP_MASS,
+				TOT_MASS,
+				CASE_INFO,
+				IMPULSE_CLASS,
+				MANUFACTURER
+		},
+		/* selection */groupCol + "=?",
+		/* selection args*/new String[] {groupVal},
+		/* groupby */null,
+		/* having*/null,
+		/* orderby*/ NAME );
+
+	}
+
+	/**
+	 * Fetch the groups based on groupCol
+	 * @param groupCol
+	 * @return
+	 */
+	public Cursor fetchGroups( String groupCol ) {
+		return mDb.query(true, DATABASE_TABLE, 
+				/* columns */new String[] {
+				groupCol
+		},
+		/* selection */null,
+		/* selection args*/null,
+		/* groupby */null,
+		/* having*/null,
+		/* orderby*/null,
+		/* limit*/ null);
+
+	}
+
+	/**
+	 * Return a Cursor over the list of all motors
+	 * 
+	 * @return Cursor over all notes
+	 */
+	public Cursor fetchAllMotors() {
+
+		return mDb.query(DATABASE_TABLE, 
+				/* columns */new String[] {
+				ID,
+				NAME,
+				DIAMETER ,
+				TOTAL_IMPULSE,
+				AVG_THRUST ,
+				MAX_THRUST ,
+				BURN_TIME ,
+				LENGTH,
+				PROP_MASS,
+				TOT_MASS,
+				CASE_INFO,
+				IMPULSE_CLASS,
+				MANUFACTURER
+		},
+		/* selection */null,
+		/* selection args*/null,
+		/* groupby */null,
+		/* having*/null,
+		/* orderby*/null);
+	}
+
+	public Motor fetchMotor(Long id ) throws SQLException {
+		Cursor mCursor = mDb.query(DATABASE_TABLE, 
+				/* columns */new String[] {
+				ID,
+				NAME ,
+				DIAMETER ,
+				TOTAL_IMPULSE ,
+				AVG_THRUST ,
+				MAX_THRUST ,
+				BURN_TIME ,
+				LENGTH,
+				PROP_MASS,
+				TOT_MASS,
+				CASE_INFO,
+				IMPULSE_CLASS,
+				MANUFACTURER,
+				BURNDATA
+		},
+		/* selection */ID + "="+id,
+		/* selection args*/null,
+		/* groupby */null,
+		/* having*/null,
+		/* orderby*/null);
+		if ( mCursor == null ) {
+			return null;
+		}
+		try {
+			if (mCursor.getCount() == 0) {
+				return null;
+			}
+			mCursor.moveToFirst();
+			Motor mi = new Motor();
+			mi.setMotor_id(mCursor.getLong(mCursor.getColumnIndex(ID)));
+			mi.setName(mCursor.getString(mCursor.getColumnIndex(NAME)));
+			mi.setDiameter(mCursor.getLong(mCursor.getColumnIndex(DIAMETER)));
+			mi.setTotalImpulse(mCursor.getFloat(mCursor.getColumnIndex(TOTAL_IMPULSE)));
+			mi.setAvgThrust(mCursor.getFloat(mCursor.getColumnIndex(AVG_THRUST)));
+			mi.setMaxThrust(mCursor.getFloat(mCursor.getColumnIndex(MAX_THRUST)));
+			mi.setBurnTime(mCursor.getFloat(mCursor.getColumnIndex(BURN_TIME)));
+			mi.setLength(mCursor.getFloat(mCursor.getColumnIndex(LENGTH)));
+			mi.setPropMass(mCursor.getDouble(mCursor.getColumnIndex(PROP_MASS)));
+			mi.setCaseInfo(mCursor.getString(mCursor.getColumnIndex(CASE_INFO)));
+			mi.setTotMass(mCursor.getDouble(mCursor.getColumnIndex(TOT_MASS)));
+			mi.setManufacturer(mCursor.getString(mCursor.getColumnIndex(MANUFACTURER)));
+			mi.setImpulseClass(mCursor.getString(mCursor.getColumnIndex(IMPULSE_CLASS)));
+
+			{
+				// Deserialize burndata column
+				byte[] serObj = mCursor.getBlob(mCursor.getColumnIndex(BURNDATA));
+				Vector<Double> burndata = null;
+				if (serObj != null ) {
+					try {
+						ObjectInputStream is = new ObjectInputStream( new ByteArrayInputStream(serObj));
+						burndata = (Vector<Double>) is.readObject();
+					}
+					catch (Exception ex) {
+						Log.d(TAG,"cannot deserialize burndata");
+					}
+				}
+				mi.setBurndata(burndata);
+			}
+			return mi;
+		}
+		finally {
+			mCursor.close();
+		}
+
+	}
+
+}
diff --git a/src/net/sf/openrocket/android/motor/BurnPlotFragment.java b/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
new file mode 100644
index 00000000..1a8df463
--- /dev/null
+++ b/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
@@ -0,0 +1,243 @@
+package net.sf.openrocket.android.motor;
+
+import java.util.Vector;
+
+import net.sf.openrocket.R;
+import android.app.Activity;
+import android.graphics.Color;
+import android.graphics.PointF;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+
+import com.androidplot.xy.BoundaryMode;
+import com.androidplot.xy.LineAndPointFormatter;
+import com.androidplot.xy.LineAndPointRenderer;
+import com.androidplot.xy.SimpleXYSeries;
+import com.androidplot.xy.XYPlot;
+import com.androidplot.xy.YValueMarker;
+
+public class BurnPlotFragment extends Fragment implements OnTouchListener {
+
+	private final static String TAG = "BurnPlotFragment";
+
+	private XYPlot mySimpleXYPlot;
+	private SimpleXYSeries mySeries;
+	private PointF minXY;
+	private PointF maxXY;
+	
+	private float absMinX;
+	private float absMaxX;
+	private float minNoError;
+	private float maxNoError;
+
+	private ScaleGestureDetector mScaleDetector;
+	private float mScaleFactor = 1.f;
+
+	public static BurnPlotFragment initializeBurnPlotHelper( Motor motor ) {
+		BurnPlotFragment h = new BurnPlotFragment();
+
+		Bundle args = new Bundle();
+		args.putSerializable("Motor", motor);
+		h.setArguments(args);
+		return h;
+	}
+
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		Log.d(TAG,"onAttach");
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		Log.d(TAG,"onCreate");
+		super.onCreate(savedInstanceState);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		Log.d(TAG,"onCreateView");
+		View v = inflater.inflate(R.layout.motor_burn, container, false);
+		mySimpleXYPlot = (XYPlot) v.findViewById(R.id.xyplot);
+		mySimpleXYPlot.setOnTouchListener(this);
+		mScaleDetector = new ScaleGestureDetector(v.getContext(), new ScaleListener());
+		//		Motor motor = getMotor();
+		//		init(motor);
+		return v;
+	}
+
+	void init( Motor motor ) {
+
+		mySimpleXYPlot.setUserDomainOrigin(0);
+		mySimpleXYPlot.setUserRangeOrigin(0);
+		mySimpleXYPlot.setRangeLabel("impuse (n)");
+		mySimpleXYPlot.setDomainLabel("time (s)");
+		mySimpleXYPlot.addMarker(new YValueMarker(motor.getAvgThrust(),"average" ));
+		mySimpleXYPlot.disableAllMarkup();
+
+		Vector<Double> data = null;
+		try {
+			data = motor.getBurndata();
+		} catch ( Exception ex ) {
+		}
+		if ( data == null || data.size() == 0 ) {
+			data = new Vector<Double>();
+			data.add(0.0);
+			data.add(0.0);
+			data.add(1.0);
+			data.add(1.0);
+		}
+		Log.d("plot","data = " + data.toString());
+
+		mySeries = new SimpleXYSeries(data, SimpleXYSeries.ArrayFormat.XY_VALS_INTERLEAVED,motor.getName());
+
+		mySimpleXYPlot.addSeries(mySeries, LineAndPointRenderer.class,
+				new LineAndPointFormatter(Color.rgb(0, 255, 0), Color.rgb(200, 0, 0), null));
+
+		//Set of internal variables for keeping track of the boundaries
+		mySimpleXYPlot.calculateMinMaxVals();
+		
+		mySimpleXYPlot.redraw();
+
+		minXY=new PointF(mySimpleXYPlot.getCalculatedMinX().floatValue(),mySimpleXYPlot.getCalculatedMinY().floatValue());
+		maxXY=new PointF(mySimpleXYPlot.getCalculatedMaxX().floatValue(),mySimpleXYPlot.getCalculatedMaxY().floatValue());
+
+		absMinX = minXY.x;
+		absMaxX = maxXY.x;
+		
+		minNoError = Math.round(mySeries.getX(1).floatValue() +2);
+		maxNoError = Math.round(mySeries.getX(mySeries.size() -1).floatValue()) - 2.0f;
+	}
+
+	private float mPosX;
+	private float mPosY;
+
+	private float mLastTouchX;
+	private float mLastTouchY;
+
+	private int mActivePointerId = -1;
+
+	@Override
+	public boolean onTouch(View arg0, MotionEvent event) {
+		mScaleDetector.onTouchEvent(event);
+
+		final int action = event.getAction();
+		switch ( action & MotionEvent.ACTION_MASK ) {
+		case MotionEvent.ACTION_DOWN: {
+			final float x = event.getX();
+			final float y = event.getY();
+
+			mLastTouchX = x;
+			mLastTouchY = y;
+
+			mActivePointerId = event.getPointerId(0);
+			break;
+		}
+		
+		case MotionEvent.ACTION_MOVE: {
+			final int pointerIndex = event.findPointerIndex(mActivePointerId);
+			final float x = event.getX(pointerIndex);
+			final float y = event.getY(pointerIndex);
+
+			if (!mScaleDetector.isInProgress()) {
+				final float dx = x - mLastTouchX;
+				final float dy = y - mLastTouchY;
+			
+				mPosX += dx;
+				mPosY += dy;
+				scroll(dx);
+				// do scroll.
+			
+			}
+			mLastTouchX = x;
+			mLastTouchY = y;
+			
+			break;
+		}
+		
+		case MotionEvent.ACTION_UP: {
+			mActivePointerId = -1;
+			break;
+		}
+		
+		case MotionEvent.ACTION_CANCEL: {
+			mActivePointerId = -1;
+			break;
+		}
+		
+		case MotionEvent.ACTION_POINTER_UP: {
+			final int pointerIndex = (action & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_ID_SHIFT;
+			final int pointerId = event.getPointerId(pointerIndex);
+			if (pointerId == mActivePointerId) {
+				// This was our active pointer going up.  choose a new active pointer and adjust accordingly.
+				final int newPointerIndex = pointerIndex ==0 ? 1:0;
+				mLastTouchX = event.getX(newPointerIndex);
+				mLastTouchY = event.getY(newPointerIndex);
+				mActivePointerId = event.getPointerId(newPointerIndex);
+			}
+			break;
+		}
+		}	
+		return true;
+	}
+
+	private void zoom(float scale) {
+		Log.d(TAG,"zoom by " + scale);
+		float domainSpan = absMaxX	- absMinX;
+		Log.d(TAG,"domainSpan = " + domainSpan);
+		float domainMidPoint = absMaxX		- domainSpan / 2.0f;
+		Log.d(TAG,"domainMidPoint = " + domainMidPoint);
+		float offset = domainSpan / scale;
+		Log.d(TAG,"offset " + offset);
+		minXY.x=domainMidPoint- offset;
+		Log.d(TAG,"min X " + minXY.x);
+		maxXY.x=domainMidPoint+offset;
+		Log.d(TAG,"max X " + maxXY.x);
+		checkBoundaries();
+		mySimpleXYPlot.setDomainBoundaries(minXY.x, maxXY.x, BoundaryMode.AUTO);
+		mySimpleXYPlot.redraw();
+	}
+
+	private void scroll(float pan) {
+		float domainSpan = maxXY.x	- minXY.x;
+		float step = domainSpan / mySimpleXYPlot.getWidth();
+		float offset = pan * step;
+		minXY.x+= offset;
+		maxXY.x+= offset;
+		checkBoundaries();
+		mySimpleXYPlot.setDomainBoundaries(minXY.x, maxXY.x, BoundaryMode.AUTO);
+		mySimpleXYPlot.redraw();
+	}
+
+	private void checkBoundaries() {
+		
+		if ( minXY.x < absMinX) 
+			minXY.x = absMinX;
+//		else if ( minXY.x > maxNoError )
+//			minXY.x = maxNoError;
+		
+		if ( maxXY.x > absMaxX)
+			maxXY.x = absMaxX;
+//		else if ( maxXY.x < minNoError)
+//			maxXY.x = minNoError;
+	}
+	private class ScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureListener {
+		@Override
+		public boolean onScale( ScaleGestureDetector detector ) {
+			mScaleFactor *= detector.getScaleFactor();
+
+			mScaleFactor = Math.max(1.0f, Math.min(mScaleFactor, 5.0f));
+			zoom(mScaleFactor);
+			return true;
+		}
+	}
+}
+
diff --git a/src/net/sf/openrocket/android/motor/Motor.java b/src/net/sf/openrocket/android/motor/Motor.java
new file mode 100644
index 00000000..68bd113a
--- /dev/null
+++ b/src/net/sf/openrocket/android/motor/Motor.java
@@ -0,0 +1,107 @@
+package net.sf.openrocket.android.motor;
+
+import java.io.Serializable;
+import java.util.Vector;
+
+public class Motor implements Serializable {
+	
+	private Long motor_id;
+	private String name;
+	private String impulseClass;
+	private String manufacturer;
+	private Long diameter;
+	private String caseInfo;
+	private Float avgThrust;
+	private Float maxThrust;
+	private Float totalImpulse;
+	private Float burnTime;
+	private Float length;
+	private Double propMass;
+	private Double totMass;
+	private Vector<Double> burndata;
+	public Long getMotor_id() {
+		return motor_id;
+	}
+	public void setMotor_id(Long motor_id) {
+		this.motor_id = motor_id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getImpulseClass() {
+		return impulseClass;
+	}
+	public void setImpulseClass(String impulseClass) {
+		this.impulseClass = impulseClass;
+	}
+	public String getManufacturer() {
+		return manufacturer;
+	}
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+	public Long getDiameter() {
+		return diameter;
+	}
+	public void setDiameter(Long diameter) {
+		this.diameter = diameter;
+	}
+	public String getCaseInfo() {
+		return caseInfo;
+	}
+	public void setCaseInfo(String caseInfo) {
+		this.caseInfo = caseInfo;
+	}
+	public Float getAvgThrust() {
+		return avgThrust;
+	}
+	public void setAvgThrust(Float avgThrust) {
+		this.avgThrust = avgThrust;
+	}
+	public Float getMaxThrust() {
+		return maxThrust;
+	}
+	public void setMaxThrust(Float maxThrust) {
+		this.maxThrust = maxThrust;
+	}
+	public Float getTotalImpulse() {
+		return totalImpulse;
+	}
+	public void setTotalImpulse(Float totalImpulse) {
+		this.totalImpulse = totalImpulse;
+	}
+	public Float getBurnTime() {
+		return burnTime;
+	}
+	public void setBurnTime(Float burnTime) {
+		this.burnTime = burnTime;
+	}
+	public Float getLength() {
+		return length;
+	}
+	public void setLength(Float length) {
+		this.length = length;
+	}
+	public Double getPropMass() {
+		return propMass;
+	}
+	public void setPropMass(Double propMass) {
+		this.propMass = propMass;
+	}
+	public Double getTotMass() {
+		return totMass;
+	}
+	public void setTotMass(Double totMass) {
+		this.totMass = totMass;
+	}
+	public Vector<Double> getBurndata() {
+		return burndata;
+	}
+	public void setBurndata(Vector<Double> burndata) {
+		this.burndata = burndata;
+	}
+	
+}
diff --git a/src/net/sf/openrocket/android/motor/MotorDetails.java b/src/net/sf/openrocket/android/motor/MotorDetails.java
new file mode 100644
index 00000000..19f75487
--- /dev/null
+++ b/src/net/sf/openrocket/android/motor/MotorDetails.java
@@ -0,0 +1,77 @@
+package net.sf.openrocket.android.motor;
+
+import net.sf.openrocket.R;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.ImageView;
+import android.widget.SlidingDrawer;
+
+public class MotorDetails extends FragmentActivity
+implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListener {
+
+	private final static String TAG = "MotorDetails";
+	
+	private SlidingDrawer slidingDrawer;
+	private ImageView handle;
+	
+	private Motor motor;
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Log.d(TAG,"onCreate Bundle = "+ String.valueOf(savedInstanceState));
+		setContentView(R.layout.motor_detail);
+
+		Intent i = getIntent();
+		motor = (Motor) i.getSerializableExtra("Motor");
+		
+		BurnPlotFragment burnPlot = (BurnPlotFragment) getSupportFragmentManager().findFragmentById(R.id.burnPlotFragment);
+		burnPlot.init(motor);
+		
+		MotorDetailsFragment motorDetails = (MotorDetailsFragment) getSupportFragmentManager().findFragmentById(R.id.motorDetailForm);
+		motorDetails.init(motor);
+		
+		slidingDrawer = (SlidingDrawer) findViewById(R.id.drawer);
+		
+		slidingDrawer.setOnDrawerOpenListener(this);
+		slidingDrawer.setOnDrawerCloseListener(this);
+		
+		handle = (ImageView) findViewById(R.id.handle);
+		
+	}
+	
+	@Override
+	public void onDrawerOpened() {
+		handle.setImageResource(R.drawable.arrow_down_float);
+	}
+	
+	@Override
+	public void onDrawerClosed() {
+		handle.setImageResource(R.drawable.arrow_up_float);
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+    	MenuInflater inflater = getMenuInflater();
+    	inflater.inflate(R.menu.motor_details_option_menu, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onMenuItemSelected(int featureId, MenuItem item) {
+		switch(item.getItemId()) {
+		case R.id.save:
+			// Extract form data to Motor.
+			// Save motor.
+			return true;
+		}
+		return super.onMenuItemSelected(featureId, item);
+	}
+
+
+}
diff --git a/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java b/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
new file mode 100644
index 00000000..eca5d9c6
--- /dev/null
+++ b/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
@@ -0,0 +1,43 @@
+package net.sf.openrocket.android.motor;
+
+import net.sf.openrocket.R;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+public class MotorDetailsFragment extends Fragment {
+
+	EditText manuField;
+	EditText nameField;
+	EditText caseField;
+	EditText impulseClassField;
+	EditText diameterField;
+	EditText lengthField;
+	
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.motor_detail_form, container, false);
+		manuField = (EditText) v.findViewById(R.id.motorDetailsManufacturer);
+		nameField = (EditText) v.findViewById(R.id.motorDetailsName);
+		caseField = (EditText) v.findViewById(R.id.motorDetailsCaseInfo);
+		impulseClassField = (EditText) v.findViewById(R.id.motorDetailsImpuseClass);
+		diameterField = (EditText) v.findViewById(R.id.motorDetailsDiameter);
+		lengthField = (EditText) v.findViewById(R.id.motorDetailsLength);
+		return v;
+	}
+
+	public void init( Motor m ) {
+		manuField.setText( m.getManufacturer());
+		nameField.setText( m.getName() );
+		caseField.setText( m.getCaseInfo());
+		impulseClassField.setText( m.getImpulseClass());
+		diameterField.setText( m.getDiameter().toString() );
+		lengthField.setText( m.getLength().toString() );
+		
+	}
+	
+}
diff --git a/src/net/sf/openrocket/android/motor/MotorHierarchicalBrowser.java b/src/net/sf/openrocket/android/motor/MotorHierarchicalBrowser.java
new file mode 100644
index 00000000..8344083c
--- /dev/null
+++ b/src/net/sf/openrocket/android/motor/MotorHierarchicalBrowser.java
@@ -0,0 +1,231 @@
+package net.sf.openrocket.android.motor;
+
+import net.sf.openrocket.R;
+import net.sf.openrocket.android.PreferencesActivity;
+import net.sf.openrocket.android.db.DbAdapter;
+import net.sf.openrocket.android.db.MotorDao;
+import net.sf.openrocket.android.thrustcurve.TCQueryActivity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.CursorTreeAdapter;
+import android.widget.ExpandableListView;
+import android.widget.SimpleCursorTreeAdapter;
+
+
+public class MotorHierarchicalBrowser
+extends PersistentExpandableListActivity
+implements SharedPreferences.OnSharedPreferenceChangeListener
+{
+	private static final String TAG = "MotorHierarchicalBrowser";
+
+	private static final int ACTIVITY_DOWNLOAD=0;
+
+	private static final int CONTEXTMENU_DELETE = Menu.FIRST+1;
+
+	private String groupColumnPreferenceKey;
+	private String groupColumn = MotorDao.CASE_INFO;
+
+	private static final String[] groupColumns = new String[] {
+		MotorDao.CASE_INFO,
+		MotorDao.DIAMETER,
+		MotorDao.IMPULSE_CLASS,
+		MotorDao.MANUFACTURER
+	};
+
+	private CursorTreeAdapter mAdapter;
+
+	private DbAdapter mDbHelper;
+
+	public class MotorHierarchicalListAdapter extends SimpleCursorTreeAdapter
+	{
+
+		// Note that the constructor does not take a Cursor. This is done to avoid querying the 
+		// database on the main thread.
+		public MotorHierarchicalListAdapter(Context context, Cursor cursor, int groupLayout,
+				int childLayout, String[] groupFrom, int[] groupTo, String[] childrenFrom,
+				int[] childrenTo) {
+
+			super(context, cursor, groupLayout, groupFrom, groupTo, childLayout, childrenFrom,
+					childrenTo);
+		}
+
+		@Override
+		protected Cursor getChildrenCursor(Cursor arg0) {
+			Log.d(TAG,"getChildrenCursor");
+			String group = arg0.getString(arg0.getColumnIndex(groupColumn));
+			Log.d(TAG,"  for: "+ groupColumn + " = " + group);
+			Cursor c = mDbHelper.getMotorDao().fetchAllInGroups(groupColumn,group);
+			Log.d(TAG,"  got cursor");
+			startManagingCursor(c);
+			return c;
+		}
+
+		@Override
+		public long getGroupId(int groupPosition) {
+			return groupPosition;
+		}
+
+	}
+
+	@Override
+	public void onSharedPreferenceChanged(SharedPreferences arg0, String arg1) {
+		if ( groupColumnPreferenceKey.equals(arg1) ) {
+			setGroupColumnFromPreferences(arg0);
+			refreshData();
+		}
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		mDbHelper = new DbAdapter(this);
+		mDbHelper.open();
+
+		Resources resources = this.getResources();
+		groupColumnPreferenceKey = resources.getString(R.string.PreferenceMotorBrowserGroupingOption);
+		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
+
+		setGroupColumnFromPreferences(pref);
+
+		pref.registerOnSharedPreferenceChangeListener(this);
+
+		refreshData();
+
+		registerForContextMenu(getExpandableListView());
+
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+    	MenuInflater inflater = getMenuInflater();
+    	inflater.inflate(R.menu.motor_browser_option_menu, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onMenuItemSelected(int featureId, MenuItem item) {
+		Log.d(TAG,"onMenuItemSelected" + item.getItemId());
+		switch(item.getItemId()) {
+		case R.id.download_from_thrustcurve_menu_option:
+			tcDownload();
+			return true;
+		case R.id.preference_menu_option:
+			Intent intent = new Intent().setClass(this, PreferencesActivity.class);
+			this.startActivity(intent);
+			return true;
+		}
+		return super.onMenuItemSelected(featureId, item);
+	}
+
+	@Override
+	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+		Log.d(TAG,"onCreateContextMenu " + menuInfo);
+		Log.d(TAG, "v.getId() = " + v.getId());
+		Log.d(TAG, "motorListView = " + R.id.motorListView);
+		//    	if (v.getId() == R.id.motorListView) {
+		ExpandableListView.ExpandableListContextMenuInfo info = (ExpandableListView.ExpandableListContextMenuInfo) menuInfo;
+		menu.setHeaderTitle("context menu");
+		menu.add(Menu.NONE,CONTEXTMENU_DELETE,CONTEXTMENU_DELETE,"Delete");
+		//    	}
+		super.onCreateContextMenu(menu, v, menuInfo);
+	}
+
+	@Override
+	public boolean onContextItemSelected(MenuItem item) {
+		ExpandableListView.ExpandableListContextMenuInfo info = (ExpandableListView.ExpandableListContextMenuInfo) item.getMenuInfo();
+		long motorId = info.id;
+		Log.d(TAG,"ContextMenu: " + motorId);
+		switch(item.getItemId()) {
+		case CONTEXTMENU_DELETE:
+			mDbHelper.getMotorDao().deleteMotor(motorId);
+			refreshData();
+			return true;
+		}
+		return super.onContextItemSelected(item);
+	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+		super.onActivityResult(requestCode, resultCode, intent);
+		refreshData();
+	}
+
+
+	@Override
+	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
+		super.onChildClick(parent, v, groupPosition, childPosition, id);
+		Motor m = mDbHelper.getMotorDao().fetchMotor(id);
+		//Intent i = new Intent(this, BurnPlotActivity.class);
+		Intent i = new Intent(this,MotorDetails.class);
+		i.putExtra("Motor", m);
+		startActivity(i);
+		return true;
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
+		pref.unregisterOnSharedPreferenceChangeListener(this);
+
+		// Null out the group cursor. This will cause the group cursor and all of the child cursors
+		// to be closed.
+		mAdapter.changeCursor(null);
+		mAdapter = null;
+
+		mDbHelper.close();
+	}
+
+	private void tcDownload() {
+		Intent i = new Intent(this, TCQueryActivity.class);
+		startActivityForResult(i, ACTIVITY_DOWNLOAD);
+	}
+
+	private void setGroupColumnFromPreferences( SharedPreferences prefs ) {
+		String indexStr = prefs.getString(groupColumnPreferenceKey, "1");
+		int index;
+		//Dirty hack, you can't use integer-array in ListPreferences
+		try {
+			index = Integer.parseInt(indexStr);
+		} catch ( Exception e ) {
+			index = 1;
+		}
+		if ( index >= groupColumns.length ) {
+			index = 1;
+		}
+		groupColumn = groupColumns[index];
+
+	}
+	private void refreshData() {
+		if (mAdapter != null ) {
+			mAdapter.changeCursor(null);
+		}
+		Cursor motorCursor = mDbHelper.getMotorDao().fetchGroups(groupColumn);
+		startManagingCursor(motorCursor);
+		// Set up our adapter
+		mAdapter = new MotorHierarchicalListAdapter( 
+				this,
+				motorCursor,
+				R.layout.motor_list_group,
+				R.layout.motor_list_child,
+				new String[] { groupColumn }, // Name for group layouts
+				new int[] { R.id.motorGroup },
+				new String[] { MotorDao.MANUFACTURER, MotorDao.NAME, MotorDao.TOTAL_IMPULSE }, // Number for child layouts
+				new int[] { R.id.motorChildManu, R.id.motorChildName, R.id.motorChildImpulse });
+		setListAdapter(mAdapter);
+	}
+}
diff --git a/src/net/sf/openrocket/android/motor/PersistentExpandableListActivity.java b/src/net/sf/openrocket/android/motor/PersistentExpandableListActivity.java
new file mode 100644
index 00000000..f179374a
--- /dev/null
+++ b/src/net/sf/openrocket/android/motor/PersistentExpandableListActivity.java
@@ -0,0 +1,91 @@
+package net.sf.openrocket.android.motor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import android.app.ExpandableListActivity;
+import android.os.Bundle;
+import android.widget.ExpandableListAdapter;
+import android.widget.ExpandableListView;
+
+public class PersistentExpandableListActivity extends ExpandableListActivity {
+    private long[] expandedIds;
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if (this.expandedIds != null) {
+            restoreExpandedState(expandedIds);
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        expandedIds = getExpandedIds();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        this.expandedIds = getExpandedIds();
+        outState.putLongArray("ExpandedIds", this.expandedIds);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle state) {
+        super.onRestoreInstanceState(state);
+        long[] expandedIds = state.getLongArray("ExpandedIds");
+        if (expandedIds != null) {
+            restoreExpandedState(expandedIds);
+        }
+    }
+
+    private long[] getExpandedIds() {
+        ExpandableListView list = getExpandableListView();
+        ExpandableListAdapter adapter = getExpandableListAdapter();
+        if (adapter != null) {
+            int length = adapter.getGroupCount();
+            ArrayList<Long> expandedIds = new ArrayList<Long>();
+            for(int i=0; i < length; i++) {
+                if(list.isGroupExpanded(i)) {
+                    expandedIds.add(adapter.getGroupId(i));
+                }
+            }
+            return toLongArray(expandedIds);
+        } else {
+            return null;
+        }
+    }
+
+    private void restoreExpandedState(long[] expandedIds) {
+        this.expandedIds = expandedIds;
+        if (expandedIds != null) {
+            ExpandableListView list = getExpandableListView();
+            ExpandableListAdapter adapter = getExpandableListAdapter();
+            if (adapter != null) {
+                for (int i=0; i<adapter.getGroupCount(); i++) {
+                    long id = adapter.getGroupId(i);
+                    if (inArray(expandedIds, id)) list.expandGroup(i);
+                }
+            }
+        }
+    }
+
+    private static boolean inArray(long[] array, long element) {
+        for (long l : array) {
+            if (l == element) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static long[] toLongArray(List<Long> list)  {
+        long[] ret = new long[list.size()];
+        int i = 0;
+        for (Long e : list)  
+            ret[i++] = e.longValue();
+        return ret;
+    }
+}
diff --git a/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java b/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
new file mode 100644
index 00000000..aef2ace4
--- /dev/null
+++ b/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
@@ -0,0 +1,34 @@
+package net.sf.openrocket.android.rocket;
+
+import java.io.File;
+
+import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.file.RocketLoadException;
+import net.sf.openrocket.file.openrocket.OpenRocketLoader;
+import android.os.AsyncTask;
+import android.util.Log;
+
+public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketDocument> {
+
+	private final static String TAG = "OpenRocketLoaderTask";
+	
+	/* (non-Javadoc)
+	 * @see android.os.AsyncTask#doInBackground(Params[])
+	 */
+	@Override
+	protected OpenRocketDocument doInBackground(File... arg0) {
+		Log.d(TAG,"doInBackgroud");
+		
+		OpenRocketLoader rocketLoader = new OpenRocketLoader();
+		try {
+			OpenRocketDocument rocket = rocketLoader.load(arg0[0]);
+			return rocket;
+		}
+		catch( RocketLoadException ex ) {
+			Log.e(TAG, "doInBackground rocketLaoder.load threw", ex);
+		}
+		return null;
+		
+	}
+
+}
diff --git a/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
new file mode 100644
index 00000000..35022c87
--- /dev/null
+++ b/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
@@ -0,0 +1,143 @@
+package net.sf.openrocket.android.rocket;
+
+
+import java.io.File;
+
+import net.sf.openrocket.R;
+import net.sf.openrocket.android.Application;
+import net.sf.openrocket.android.PreferencesActivity;
+import net.sf.openrocket.android.motor.MotorHierarchicalBrowser;
+import net.sf.openrocket.android.simulation.SimulationViewer;
+import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.document.Simulation;
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+public class OpenRocketViewer extends Activity {
+
+	private static final String TAG = "OpenRocketViewer";
+
+	TextView header;
+	ListView simulationList;
+	
+	Application app;
+
+
+	/* (non-Javadoc)
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		Log.d(TAG,"In onCreate");
+		
+		app = (Application) this.getApplication();
+
+		setContentView(R.layout.openrocketviewer);
+		
+		header = (TextView) findViewById(R.id.heading);
+		simulationList = (ListView) findViewById(R.id.rocketSimulations);
+
+		Intent i = getIntent();
+		Uri file = i.getData();
+		String path = file.getPath();
+		Log.d(TAG,"Use ork file: " + file);
+		File orkFile = new File(path);
+		final OpenRocketLoaderTask task = new OpenRocketLoaderTask() {
+
+			/* (non-Javadoc)
+			 * @see android.os.AsyncTask#onPostExecute(java.lang.Object)
+			 */
+			@Override
+			protected void onPostExecute(OpenRocketDocument result) {
+				super.onPostExecute(result);
+				app.setRocketDocument( result );
+				updateContents();
+			}
+			
+		};
+		
+		task.execute(orkFile);
+	}
+
+	private void updateContents() {
+		
+		OpenRocketDocument rocket = app.getRocketDocument();
+		header.setText( rocket.getRocket().getName());
+		
+		ArrayAdapter<Simulation> sims = new ArrayAdapter<Simulation>(this,android.R.layout.simple_list_item_1,rocket.getSimulations()) {
+
+			@Override
+			public View getView(int position, View convertView,
+					ViewGroup parent) {
+				View v = convertView;
+				if ( v == null ) {
+					LayoutInflater li = getLayoutInflater();
+					v = li.inflate(android.R.layout.simple_list_item_1,null);
+				}
+				Simulation sim = this.getItem(position);
+				((TextView)v.findViewById(android.R.id.text1)).setText( sim.getName() );
+				return v;
+			}
+
+		};
+		simulationList.setOnItemClickListener( new OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView l, View v, int position, long id) {
+				Intent i = new Intent(OpenRocketViewer.this, SimulationViewer.class);
+				Log.d(TAG,"onItemClick simulation number " + id );
+				i.putExtra("Simulation",(int)id);
+				startActivityForResult(i, 1/*magic*/);
+			}
+			
+		});
+		simulationList.setAdapter(sims);
+
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+    	MenuInflater inflater = getMenuInflater();
+    	inflater.inflate(R.menu.rocket_viewer_option_menu, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onMenuItemSelected(int featureId, MenuItem item) {
+		Log.d(TAG,"onMenuItemSelected" + item.getItemId());
+		switch(item.getItemId()) {
+		case R.id.motor_list_menu_option:
+			startMotorBrowser();
+			return true;
+		case R.id.preference_menu_option:
+			Intent intent = new Intent().setClass(this, PreferencesActivity.class);
+			this.startActivity(intent);
+			return true;
+		}
+		return super.onMenuItemSelected(featureId, item);
+	}
+
+	public void startMotorBrowser() {
+		Log.d(TAG,"motorBrowserButton clicked");
+    	Intent i = new Intent(OpenRocketViewer.this, MotorHierarchicalBrowser.class);
+    	startActivity(i);
+    }
+
+
+
+}
diff --git a/src/net/sf/openrocket/android/simulation/SimulationPlotFragment.java b/src/net/sf/openrocket/android/simulation/SimulationPlotFragment.java
new file mode 100644
index 00000000..ae10b90c
--- /dev/null
+++ b/src/net/sf/openrocket/android/simulation/SimulationPlotFragment.java
@@ -0,0 +1,255 @@
+package net.sf.openrocket.android.simulation;
+
+import java.util.List;
+import java.util.Vector;
+
+import net.sf.openrocket.R;
+import net.sf.openrocket.simulation.FlightDataBranch;
+import net.sf.openrocket.simulation.FlightDataType;
+import net.sf.openrocket.simulation.FlightEvent;
+import android.app.Activity;
+import android.graphics.Color;
+import android.graphics.PointF;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+
+import com.androidplot.xy.BoundaryMode;
+import com.androidplot.xy.LineAndPointFormatter;
+import com.androidplot.xy.LineAndPointRenderer;
+import com.androidplot.xy.SimpleXYSeries;
+import com.androidplot.xy.ValueMarker;
+import com.androidplot.xy.XValueMarker;
+import com.androidplot.xy.XYPlot;
+
+public class SimulationPlotFragment extends Fragment implements OnTouchListener {
+
+	private final static String TAG = "SimulationPlot";
+
+	private XYPlot mySimpleXYPlot;
+	private SimpleXYSeries mySeries;
+	private PointF minXY;
+	private PointF maxXY;
+	
+	private float absMinX;
+	private float absMaxX;
+	private float minNoError;
+	private float maxNoError;
+
+	private ScaleGestureDetector mScaleDetector;
+	private float mScaleFactor = 1.f;
+
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		Log.d(TAG,"onAttach");
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		Log.d(TAG,"onCreate");
+		super.onCreate(savedInstanceState);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		Log.d(TAG,"onCreateView");
+		View v = inflater.inflate(R.layout.motor_burn, container, false);
+		mySimpleXYPlot = (XYPlot) v.findViewById(R.id.xyplot);
+		mySimpleXYPlot.setOnTouchListener(this);
+		mScaleDetector = new ScaleGestureDetector(v.getContext(), new ScaleListener());
+		//		Motor motor = getMotor();
+		//		init(motor);
+		return v;
+	}
+
+	void init( FlightDataBranch data, FlightDataType selectedSeries, List<FlightEvent> eventsToShow ) {
+
+		mySimpleXYPlot.clear();
+		
+		if ( data == null || selectedSeries == null || eventsToShow == null ) {
+			return;
+		}
+		
+		mySimpleXYPlot.setUserDomainOrigin(0);
+		mySimpleXYPlot.setUserRangeOrigin(0);
+		mySimpleXYPlot.setRangeLabel("");
+		mySimpleXYPlot.setDomainLabel(FlightDataType.TYPE_TIME.getUnitGroup().getDefaultUnit().toString());
+		mySimpleXYPlot.setRangeLabel( selectedSeries.getUnitGroup().getDefaultUnit().toString() ); 
+		mySimpleXYPlot.disableAllMarkup();
+
+		for ( FlightEvent event : eventsToShow ) {
+			XValueMarker xmarker = new XValueMarker( event.getTime(), event.getType().toString() );
+			xmarker.setTextOrientation( ValueMarker.TextOrientation.VERTICAL );
+			mySimpleXYPlot.addMarker( xmarker );
+		}
+		
+		List<Double> yvals = null;
+		List<Double> xvals = null;
+		try {
+			yvals = data.get(selectedSeries);
+			xvals = data.get(FlightDataType.TYPE_TIME);
+			Log.d("plot","data = " + yvals);
+		} catch ( Exception ex ) {
+			Log.d(TAG, "Exception: " + ex);
+		}
+		if ( yvals == null || yvals.size() == 0 ) {
+			yvals = new Vector<Double>();
+			yvals.add(0.0);
+			yvals.add(0.0);
+			yvals.add(1.0);
+			yvals.add(1.0);
+		}
+		Log.d("plot","data = " + yvals.toString());
+
+		mySeries = new SimpleXYSeries(xvals, yvals, FlightDataType.TYPE_ALTITUDE.toString());
+
+		mySimpleXYPlot.addSeries(mySeries, LineAndPointRenderer.class,
+				new LineAndPointFormatter(Color.rgb(0, 255, 0), Color.rgb(200, 0, 0), null));
+
+		//Set of internal variables for keeping track of the boundaries
+		mySimpleXYPlot.calculateMinMaxVals();
+	
+		mySimpleXYPlot.redraw();
+
+		minXY=new PointF(mySimpleXYPlot.getCalculatedMinX().floatValue(),mySimpleXYPlot.getCalculatedMinY().floatValue());
+		maxXY=new PointF(mySimpleXYPlot.getCalculatedMaxX().floatValue(),mySimpleXYPlot.getCalculatedMaxY().floatValue());
+
+		absMinX = minXY.x;
+		absMaxX = maxXY.x;
+		
+		minNoError = Math.round(mySeries.getX(1).floatValue() +2);
+		maxNoError = Math.round(mySeries.getX(mySeries.size() -1).floatValue()) - 2.0f;
+	}
+
+	private float mPosX;
+	private float mPosY;
+
+	private float mLastTouchX;
+	private float mLastTouchY;
+
+	private int mActivePointerId = -1;
+
+	@Override
+	public boolean onTouch(View arg0, MotionEvent event) {
+		mScaleDetector.onTouchEvent(event);
+
+		final int action = event.getAction();
+		switch ( action & MotionEvent.ACTION_MASK ) {
+		case MotionEvent.ACTION_DOWN: {
+			final float x = event.getX();
+			final float y = event.getY();
+
+			mLastTouchX = x;
+			mLastTouchY = y;
+
+			mActivePointerId = event.getPointerId(0);
+			break;
+		}
+		
+		case MotionEvent.ACTION_MOVE: {
+			final int pointerIndex = event.findPointerIndex(mActivePointerId);
+			final float x = event.getX(pointerIndex);
+			final float y = event.getY(pointerIndex);
+
+			if (!mScaleDetector.isInProgress()) {
+				final float dx = x - mLastTouchX;
+				final float dy = y - mLastTouchY;
+			
+				mPosX += dx;
+				mPosY += dy;
+				scroll(dx);
+				// do scroll.
+			
+			}
+			mLastTouchX = x;
+			mLastTouchY = y;
+			
+			break;
+		}
+		
+		case MotionEvent.ACTION_UP: {
+			mActivePointerId = -1;
+			break;
+		}
+		
+		case MotionEvent.ACTION_CANCEL: {
+			mActivePointerId = -1;
+			break;
+		}
+		
+		case MotionEvent.ACTION_POINTER_UP: {
+			final int pointerIndex = (action & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_ID_SHIFT;
+			final int pointerId = event.getPointerId(pointerIndex);
+			if (pointerId == mActivePointerId) {
+				// This was our active pointer going up.  choose a new active pointer and adjust accordingly.
+				final int newPointerIndex = pointerIndex ==0 ? 1:0;
+				mLastTouchX = event.getX(newPointerIndex);
+				mLastTouchY = event.getY(newPointerIndex);
+				mActivePointerId = event.getPointerId(newPointerIndex);
+			}
+			break;
+		}
+		}	
+		return true;
+	}
+
+	private void zoom(float scale) {
+		Log.d(TAG,"zoom by " + scale);
+		float domainSpan = absMaxX	- absMinX;
+		Log.d(TAG,"domainSpan = " + domainSpan);
+		float domainMidPoint = absMaxX		- domainSpan / 2.0f;
+		Log.d(TAG,"domainMidPoint = " + domainMidPoint);
+		float offset = domainSpan / scale;
+		Log.d(TAG,"offset " + offset);
+		minXY.x=domainMidPoint- offset;
+		Log.d(TAG,"min X " + minXY.x);
+		maxXY.x=domainMidPoint+offset;
+		Log.d(TAG,"max X " + maxXY.x);
+		checkBoundaries();
+		mySimpleXYPlot.setDomainBoundaries(minXY.x, maxXY.x, BoundaryMode.AUTO);
+		mySimpleXYPlot.redraw();
+	}
+
+	private void scroll(float pan) {
+		float domainSpan = maxXY.x	- minXY.x;
+		float step = domainSpan / mySimpleXYPlot.getWidth();
+		float offset = pan * step;
+		minXY.x+= offset;
+		maxXY.x+= offset;
+		checkBoundaries();
+		mySimpleXYPlot.setDomainBoundaries(minXY.x, maxXY.x, BoundaryMode.AUTO);
+		mySimpleXYPlot.redraw();
+	}
+
+	private void checkBoundaries() {
+		
+		if ( minXY.x < absMinX) 
+			minXY.x = absMinX;
+//		else if ( minXY.x > maxNoError )
+//			minXY.x = maxNoError;
+		
+		if ( maxXY.x > absMaxX)
+			maxXY.x = absMaxX;
+//		else if ( maxXY.x < minNoError)
+//			maxXY.x = minNoError;
+	}
+	private class ScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureListener {
+		@Override
+		public boolean onScale( ScaleGestureDetector detector ) {
+			mScaleFactor *= detector.getScaleFactor();
+
+			mScaleFactor = Math.max(1.0f, Math.min(mScaleFactor, 5.0f));
+			zoom(mScaleFactor);
+			return true;
+		}
+	}
+}
+
diff --git a/src/net/sf/openrocket/android/simulation/SimulationViewer.java b/src/net/sf/openrocket/android/simulation/SimulationViewer.java
new file mode 100644
index 00000000..fd4bd5f3
--- /dev/null
+++ b/src/net/sf/openrocket/android/simulation/SimulationViewer.java
@@ -0,0 +1,187 @@
+package net.sf.openrocket.android.simulation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sf.openrocket.R;
+import net.sf.openrocket.android.Application;
+import net.sf.openrocket.document.Simulation;
+import net.sf.openrocket.simulation.FlightDataBranch;
+import net.sf.openrocket.simulation.FlightDataType;
+import net.sf.openrocket.simulation.FlightEvent;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.SlidingDrawer;
+import android.widget.TabHost;
+import android.widget.TextView;
+
+public class SimulationViewer extends FragmentActivity
+implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListener {
+
+	private final static String TAG = "MotorDetails";
+
+	private SlidingDrawer slidingDrawer;
+	private ImageView handle;
+
+	private ListView eventList;
+	private ListView seriesList;
+
+	private SimulationPlotFragment simPlot;
+
+	private Simulation sim;
+	private FlightDataBranch data;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Log.d(TAG,"onCreate Bundle = "+ String.valueOf(savedInstanceState));
+		setContentView(R.layout.simulation_detail);
+
+		Intent i = getIntent();
+		int simnumber = i.getIntExtra("Simulation", 0);
+		sim = ((Application)this.getApplication()).getRocketDocument().getSimulation(simnumber);
+		data = sim.getSimulatedData().getBranch(0);
+
+		simPlot = (SimulationPlotFragment) getSupportFragmentManager().findFragmentById(R.id.simulationPlotFragment);
+
+		slidingDrawer = (SlidingDrawer) findViewById(R.id.drawer);
+
+		slidingDrawer.setOnDrawerOpenListener(this);
+		slidingDrawer.setOnDrawerCloseListener(this);
+
+		handle = (ImageView) findViewById(R.id.handle);
+
+		TabHost tabs=(TabHost)findViewById(R.id.simulationConfigurationForm);
+
+		tabs.setup();
+
+		TabHost.TabSpec spec=tabs.newTabSpec("tag1");
+
+		spec.setContent(R.id.simulationEventsList);
+		spec.setIndicator("Events");
+		tabs.addTab(spec);
+
+		spec=tabs.newTabSpec("tag2");
+		spec.setContent(R.id.simulationSeriesList);
+		spec.setIndicator("Series");
+		tabs.addTab(spec);	
+
+		eventList = (ListView) findViewById(R.id.simulationEventsList);
+
+		seriesList = (ListView) findViewById(R.id.simulationSeriesList);
+
+		// Initialize the eventList
+		ArrayAdapter<FlightEvent> events = new ArrayAdapter<FlightEvent>(this,android.R.layout.simple_list_item_multiple_choice,data.getEvents()) {
+
+			@Override
+			public View getView(int position, View convertView,
+					ViewGroup parent) {
+				View v = convertView;
+				if ( v == null ) {
+					LayoutInflater li = getLayoutInflater();
+					v = li.inflate(android.R.layout.simple_list_item_multiple_choice,null);
+				}
+				FlightEvent event = this.getItem(position);
+				((TextView)v.findViewById(android.R.id.text1)).setText( event.getType().toString() + " " + event.getTime() + " (s)" );
+				return v;
+			}
+
+		};
+		eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+		eventList.setAdapter(events);
+
+		List<FlightDataType> selectableSeries = new ArrayList<FlightDataType>();
+		for( FlightDataType fdt : data.getTypes() ) {
+			if ( fdt == FlightDataType.TYPE_TIME ) { 
+
+			} else {
+				selectableSeries.add(fdt);
+			}
+		}
+		ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(this,android.R.layout.simple_list_item_multiple_choice,selectableSeries) {
+
+			@Override
+			public View getView(int position, View convertView,
+					ViewGroup parent) {
+				View v = convertView;
+				if ( v == null ) {
+					LayoutInflater li = getLayoutInflater();
+					v = li.inflate(android.R.layout.simple_list_item_multiple_choice,null);
+				}
+				FlightDataType fdt = this.getItem(position);
+				((TextView)v.findViewById(android.R.id.text1)).setText( fdt.toString() );
+				return v;
+			}
+
+		};
+		seriesList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+		seriesList.setAdapter(serieses);
+		redraw();
+
+	}
+
+	@Override
+	public void onDrawerOpened() {
+		handle.setImageResource(R.drawable.arrow_down_float);
+	}
+
+	@Override
+	public void onDrawerClosed() {
+		handle.setImageResource(R.drawable.arrow_up_float);
+		redraw();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.motor_details_option_menu, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onMenuItemSelected(int featureId, MenuItem item) {
+		switch(item.getItemId()) {
+		case R.id.save:
+			// Extract form data to Motor.
+			// Save motor.
+			return true;
+		}
+		return super.onMenuItemSelected(featureId, item);
+	}
+
+	private void redraw() {
+		List<FlightEvent> eventsToShow = new ArrayList<FlightEvent>();
+		{
+			SparseBooleanArray eventsSelected = eventList.getCheckedItemPositions();
+			List<FlightEvent> flightEvents = data.getEvents();
+			for( int i=0; i< flightEvents.size(); i++ ) {
+				if ( eventsSelected.get(i) ) {
+					eventsToShow.add(flightEvents.get(i) );
+				}
+			}
+		}
+		FlightDataType selectedSeries = null;
+		{
+			int selected = seriesList.getCheckedItemPosition();
+			if ( selected >= 0 ) {
+				selectedSeries = (FlightDataType) seriesList.getAdapter().getItem(selected);
+			}
+		}
+
+		simPlot.init(data, selectedSeries, eventsToShow );
+
+	}
+
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/Base64Decoder.java b/src/net/sf/openrocket/android/thrustcurve/Base64Decoder.java
new file mode 100644
index 00000000..e172edc3
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/Base64Decoder.java
@@ -0,0 +1,122 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+public abstract class Base64Decoder {
+
+	private static final String BASE64_CHARS =
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	private static final char PAD_CHAR = '=';
+
+	private final static short[]  _charToBits = new short[128];
+
+	static {
+
+		for (int i = 0; i < _charToBits.length; i++)
+			_charToBits[i] = -1;
+
+		for (int i = 0; i < BASE64_CHARS.length(); i++)
+			_charToBits[BASE64_CHARS.charAt(i)] = (byte) i;
+		_charToBits[PAD_CHAR] = 0;
+
+	}
+	
+	/**
+	 * Decode the specified Base64 string and write binary data
+	 * to the given stream.
+	 * @param str Base64 encoded string
+	 * @param w output stream
+	 */
+	public static String decodeData(String str) throws IOException
+	{
+		StringReader  r;
+		int           c1;
+
+		if (str == null || str.length() < 1)
+			return null;
+
+		r = new StringReader(str);
+		
+		StringWriter w = new StringWriter();
+
+		// spin through the input string
+		c1 = readToNonSpace(r);
+		while (c1 > 0)
+		{
+			int  c2, c3, c4;
+			int  p1, p2, p3, p4;
+			int  pad, n;
+
+			pad = 0;
+
+			c2 = readToNonSpace(r);
+			c3 = readToNonSpace(r);
+			c4 = readToNonSpace(r);
+			if (c4 < 0)
+				throw new IllegalArgumentException("Encoded string ends prematurely.");
+
+			p1 = charToBits(c1);
+			p2 = charToBits(c2);
+
+			if (c3 == PAD_CHAR)
+			{
+				p3 = 0;
+				pad++;
+			}
+			else
+				p3 = charToBits(c3);
+
+			if (c4 == PAD_CHAR)
+			{
+				p4 = 0;
+				pad++;
+			}
+			else
+				p4 = charToBits(c4);
+
+			if (p1 < 0 || p2 < 0 || p3 < 0 || p4 < 0)
+				throw new IllegalArgumentException("Encoded string contains invalid characters.");
+
+			n = (p1 << 18) | (p2 << 12) | (p3 << 6) | p4;
+
+			w.write((byte) ((n & 0xFF0000) >> 16));
+			if (pad < 2)
+				w.write((byte) ((n & 0x00FF00) >> 8));
+			if (pad < 1)
+				w.write((byte) (n & 0x0000FF));
+
+			c1 = readToNonSpace(r);
+			if (c1 > 0 && pad > 0)
+				throw new IllegalArgumentException("Extra characters found after padding.");
+		}
+		
+		return w.toString();
+	}
+
+
+	private static int readToNonSpace(Reader r)
+	throws IOException
+	{
+		int  c;
+
+		c = r.read();
+		while (c >= 0 && Character.isWhitespace(c))
+			c = r.read();
+
+		return c;
+	}
+
+	private static int charToBits(int c)
+	{
+		// use it to look up the value
+		if (c < 0 || c >= _charToBits.length)
+			return -1;
+		else
+			return _charToBits[c];
+	}
+
+
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/DownloadRequest.java b/src/net/sf/openrocket/android/thrustcurve/DownloadRequest.java
new file mode 100644
index 00000000..98d22c13
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/DownloadRequest.java
@@ -0,0 +1,43 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.util.ArrayList;
+
+class DownloadRequest {
+
+	private ArrayList<Integer> motorIds = new ArrayList<Integer>();
+	
+	private String format = null;
+	
+	public void add( Integer motorId ) {
+		this.motorIds.add(motorId);
+	}
+	
+	public void setFormat( String format ) {
+		this.format = format;
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder w = new StringBuilder();
+		
+        w.append("<?xml version=\"1.0\" encoding=\"ascii\"?>\n");
+        w.append("<download-request\n");
+        w.append(" xmlns=\"http://www.thrustcurve.org/2008/DownloadRequest\"\n");
+        w.append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
+        w.append(" xsi:schemaLocation=\"http://www.thrustcurve.org/2008/DownloadRequest http://www.thrustcurve.org/2008/download-request.xsd\">\n");
+
+        if ( format != null ) {
+        	w.append("  <format>").append(format).append("</format>\n");
+        }
+        
+        w.append("  <motor-ids>\n");
+          for( Integer i : motorIds ) {
+        	  w.append("      <id>").append(i).append("</id>\n");
+          }
+        w.append("  </motor-ids>\n");
+        w.append("</download-request>\n");
+        return w.toString();
+	}
+
+	
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java b/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
new file mode 100644
index 00000000..84e15916
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
@@ -0,0 +1,37 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class DownloadResponse {
+
+	private Map<Integer,MotorBurnFile> data = new HashMap<Integer,MotorBurnFile>();
+	
+	private String error = null;
+	
+	public void add( MotorBurnFile mbd ) {
+		MotorBurnFile currentData = data.get(mbd.getMotorId());
+		if ( currentData == null || currentData.getDatapoints().size() < mbd.getDatapoints().size() ) {
+			data.put(mbd.getMotorId(),mbd);
+		}
+	}
+
+	public MotorBurnFile getData(Integer motor_id) {
+		return data.get(motor_id);
+	}
+	
+	public void setError(String error) {
+		this.error = error;
+	}
+	
+	public String getError() {
+		return error;
+	}
+	
+	@Override
+	public String toString() {
+		return "DownloadResponse [error=" + error + ", data=" + data + "]";
+	}
+
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java b/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java
new file mode 100644
index 00000000..7e24e7eb
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java
@@ -0,0 +1,122 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.io.InputStream;
+
+import org.xml.sax.Attributes;
+
+import android.sax.Element;
+import android.sax.EndElementListener;
+import android.sax.EndTextElementListener;
+import android.sax.RootElement;
+import android.sax.StartElementListener;
+import android.util.Log;
+import android.util.Xml;
+
+public class DownloadResponseParser {
+
+	private static final String TAG = "DownloadResponseParser";
+
+	private static final String thrustcurveURI = "http://www.thrustcurve.org/2009/DownloadResponse";
+
+	private static final String root_tag = "download-response";
+	private static final String results_tag = "results";
+	private static final String result_tag = "result";
+	private static final String motor_id_tag = "motor-id";
+	private static final String simfile_id_tag = "simfile-id";
+	private static final String format_tag = "format";
+	private static final String source_tag = "source";
+	private static final String license_tag = "license";
+	private static final String data_tag = "data";
+	private static final String error_tag = "error";
+
+	public static DownloadResponse parse( InputStream in ) {
+
+		final DownloadResponse ret = new DownloadResponse();
+		final MotorBurnFile currentMotor = new MotorBurnFile();
+
+		// Have a place to put the data string and format.
+		// We hold on to these here, then push them into the currentMotor
+		// only if it a supported filetype
+		final StringHolder current_format = new StringHolder();
+		final StringHolder current_data = new StringHolder();
+
+		RootElement rootEl = new RootElement(thrustcurveURI, root_tag);
+		/*
+		rootEl.setStartElementListener(
+				new StartElementListener() {
+					public void start(Attributes arg0) {
+						Log.d(TAG,"Start Element error");
+						ret.setError("IsError");
+					}
+				}
+				);
+				*/
+		Element resultsEl = rootEl.getChild( thrustcurveURI, results_tag);
+		Element resultEl = resultsEl.getChild( thrustcurveURI, result_tag);
+		resultEl.setStartElementListener(
+				new StartElementListener() {
+					@Override
+					public void start(Attributes arg0) {
+						Log.d(TAG,"Start Element result");
+						currentMotor.init();
+					}
+				}
+				);
+
+		resultEl.setEndElementListener(
+				new EndElementListener() {
+					@Override
+					public void end() {
+						if ( SupportedFileTypes.isSupportedFileType(current_format.s) ) {
+							currentMotor.setFiletype(current_format.s);
+							String s = null;
+							try {
+								s = Base64Decoder.decodeData(current_data.s);
+							} catch ( Exception ex ) {
+								Log.d(TAG,"base64: " + ex.getMessage());
+							}
+							currentMotor.decodeFile( s );
+						}
+						ret.add((MotorBurnFile)currentMotor.clone());
+					}
+				}
+				);
+
+		resultEl.getChild(thrustcurveURI,motor_id_tag).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setMotor_id(Integer.parseInt(arg0));
+					}
+				}
+				);
+		resultEl.getChild(thrustcurveURI,format_tag).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						current_format.s = arg0;
+					}
+				}
+				);
+		resultEl.getChild(thrustcurveURI,data_tag).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						current_data.s = arg0;
+					}
+				}
+				);
+		try {
+			Xml.parse(in, Xml.Encoding.UTF_8,  rootEl.getContentHandler());
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+
+		return ret;
+	}
+
+	private static class StringHolder {
+		public String s;
+	}
+
+}
\ No newline at end of file
diff --git a/src/net/sf/openrocket/android/thrustcurve/MotorBurnFile.java b/src/net/sf/openrocket/android/thrustcurve/MotorBurnFile.java
new file mode 100644
index 00000000..58f7bb3e
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/MotorBurnFile.java
@@ -0,0 +1,89 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.util.Vector;
+
+public class MotorBurnFile {
+
+	private Integer motor_id;
+	private String filetype;
+	private Float length;
+	private String delays;
+	private Double propWeightG;
+	private Double totWeightG;
+	private Vector<Double> datapoints = new Vector<Double>();
+	
+	public void init() {
+		this.motor_id = null;
+		this.filetype = null;
+		this.length = null;
+		this.delays = null;
+		this.propWeightG = null;
+		this.totWeightG = null;
+		this.datapoints = new Vector<Double>();
+	}
+	
+	@Override
+	public MotorBurnFile clone() {
+		MotorBurnFile clone = new MotorBurnFile();
+		clone.motor_id = this.motor_id;
+		clone.filetype = this.filetype;
+		clone.length = this.length;
+		clone.delays = this.delays;
+		clone.propWeightG = this.propWeightG;
+		clone.totWeightG = this.totWeightG;
+		clone.datapoints = this.datapoints;
+		return clone;
+	}
+
+	public void decodeFile(String data){
+		if (SupportedFileTypes.RASP_FORMAT.equals(filetype)) {
+			RaspBurnFile.parse(this,data);
+		} else if (SupportedFileTypes.ROCKSIM_FORMAT.equals(filetype) ){
+			RSEBurnFile.parse(this,data);
+		}
+	}
+	
+	public Integer getMotorId() {
+		return motor_id;
+	}
+	public String getFileType() {
+		return filetype;
+	}
+	public Float getLength() {
+		return length;
+	}
+	public String getDelays() {
+		return delays;
+	}
+	public Double getPropWeightG() {
+		return propWeightG;
+	}
+	public Double getTotWeightG() {
+		return totWeightG;
+	}
+	public Vector<Double> getDatapoints() {
+		return datapoints;
+	}
+
+	void setMotor_id(Integer motor_id) {
+		this.motor_id = motor_id;
+	}
+	void setFiletype(String filetype ) {
+		this.filetype = filetype;
+	}
+	void setLength(Float length) {
+		this.length = length;
+	}
+	void setDelays(String delays) {
+		this.delays = delays;
+	}
+	void setPropWeightG(Double propWeightG) {
+		this.propWeightG = propWeightG;
+	}
+	void setTotWeightG(Double totWeightG) {
+		this.totWeightG = totWeightG;
+	}
+	void setDatapoints(Vector<Double> datapoints) {
+		this.datapoints = datapoints;
+	}
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/RSEBurnFile.java b/src/net/sf/openrocket/android/thrustcurve/RSEBurnFile.java
new file mode 100644
index 00000000..0c937571
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/RSEBurnFile.java
@@ -0,0 +1,131 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Vector;
+
+import org.xml.sax.Attributes;
+
+import android.sax.Element;
+import android.sax.RootElement;
+import android.sax.StartElementListener;
+import android.util.Log;
+import android.util.Xml;
+
+class RSEBurnFile extends MotorBurnFile {
+
+	private final static String TAG = "RSEBurnFile";
+
+	static void parse( MotorBurnFile that, String filecontents ) {
+
+		parse(that, new ByteArrayInputStream(filecontents.getBytes()) );
+	}
+
+	private final static String root_tag = "engine-database";
+	private final static String engine_list_tag = "engine-list";
+	private final static String engine_tag = "engine";
+
+	private final static String delays_attr = "delays";
+	private final static String len_attr = "len";
+	private final static String propwgt_attr = "propWt";
+	private final static String totwgt_attr = "initWt";
+
+	private final static String data_tag = "data";
+	private final static String eng_data_tag = "eng-data";
+
+	private final static String time_attr="t";
+	private final static String force_attr="f";
+
+	static void parse( final MotorBurnFile that, InputStream in ) {
+
+		RootElement rootEl = new RootElement(root_tag);
+		Element engineEl = rootEl.getChild(engine_list_tag).getChild(engine_tag);
+
+		final Vector<Double> datapoints = new Vector<Double>();
+		
+		Log.d(TAG,"parsing start");
+
+		engineEl.setStartElementListener(
+				new StartElementListener() {
+					@Override
+					public void start(Attributes arg0) {
+						Log.d(TAG,"start engineEl");
+						that.setPropWeightG(Double.parseDouble(arg0.getValue(propwgt_attr)));
+						that.setTotWeightG(Double.parseDouble(arg0.getValue(totwgt_attr)));
+						that.setLength(Float.parseFloat(arg0.getValue(len_attr)));
+						that.setDelays(arg0.getValue(delays_attr));
+						Log.d(TAG, "me is now " + that.toString());
+					}
+				}
+		);
+
+		Element datapointEl = engineEl.getChild(data_tag).getChild(eng_data_tag);
+		datapointEl.setStartElementListener(
+				new StartElementListener() {
+					@Override
+					public void start(Attributes attributes) {
+						Double x = Double.parseDouble(attributes.getValue(time_attr));
+						Double y = Double.parseDouble(attributes.getValue(force_attr));
+						Log.d(TAG, "add data point " + x + "," + y);
+						datapoints.add(x);
+						datapoints.add(y);
+					}
+				}
+		);
+
+		try {
+            Xml.parse(in, Xml.Encoding.UTF_8,  rootEl.getContentHandler());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+		that.setDatapoints(datapoints);
+	}
+}
+//
+//	<engine-database>
+//	 <engine-list>
+//	<engine FDiv="10" FFix="1" FStep="-1." Isp="202.11" Itot="8.919" Type="single-use" auto-calc-cg="1" auto-calc-mass="1" avgThrust="3.795" burn-time="2.35" cgDiv="10" cgFix="1" cgStep="-1." code="C4" delays="3,5,7" dia="18." exitDia="0." initWt="17." len="50." mDiv="10" mFix="1" mStep="-1." massFrac="26.47" mfg="Apogee" peakThrust="11.31" propWt="4.5" tDiv="10" tFix="1" tStep="-1." throatDia="0.">
+//	<comments>Apogee C4 RASP.ENG file made from NAR published data
+//	File produced September 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.
+//	</comments>
+//	<data>
+//	<eng-data cg="25." f="0." m="4.5" t="0."/>
+//	<eng-data cg="25." f="3.23" m="4.48533" t="0.018"/>
+//	<eng-data cg="25." f="6.874" m="4.42671" t="0.041"/>
+//	<eng-data cg="25." f="8.779" m="4.00814" t="0.147"/>
+//	<eng-data cg="25." f="10.683" m="3.28643" t="0.294"/>
+//	<eng-data cg="25." f="11.31" m="2.89252" t="0.365"/>
+//	<eng-data cg="25." f="10.521" m="2.76585" t="0.388"/>
+//	<eng-data cg="25." f="8.779" m="2.649" t="0.412"/>
+//	<eng-data cg="25." f="7.04" m="2.53328" t="0.441"/>
+//	<eng-data cg="25." f="4.555" m="2.46308" t="0.465"/>
+//	<eng-data cg="25." f="3.479" m="2.33337" t="0.529"/>
+//	<eng-data cg="25." f="2.981" m="2.1704" t="0.629"/>
+//	<eng-data cg="25." f="3.23" m="2.1328" t="0.653"/>
+//	<eng-data cg="25." f="2.816" m="2.03366" t="0.718"/>
+//	<eng-data cg="25." f="2.733" m="1.84469" t="0.853"/>
+//	<eng-data cg="25." f="2.65" m="1.5568" t="1.065"/>
+//	<eng-data cg="25." f="2.567" m="1.30938" t="1.253"/>
+//	<eng-data cg="25." f="2.401" m="1.05873" t="1.453"/>
+//	<eng-data cg="25." f="2.484" m="0.761739" t="1.694"/>
+//	<eng-data cg="25." f="2.484" m="0.636413" t="1.794"/>
+//	<eng-data cg="25." f="2.733" m="0.612724" t="1.812"/>
+//	<eng-data cg="25." f="2.401" m="0.575165" t="1.841"/>
+//	<eng-data cg="25." f="2.401" m="0.446759" t="1.947"/>
+//	<eng-data cg="25." f="2.401" m="0.246881" t="2.112"/>
+//	<eng-data cg="25." f="2.401" m="0.0978809" t="2.235"/>
+//	<eng-data cg="25." f="2.236" m="0.0429024" t="2.282"/>
+//	<eng-data cg="25." f="1.656" m="0.0134478" t="2.312"/>
+//	<eng-data cg="25." f="0.662" m="0.003507" t="2.329"/>
+//	<eng-data cg="25." f="0." m="-0." t="2.35"/>
+//	</data>
+//	</engine>
+//	 </engine-list>
+//	</engine-database>
+//
diff --git a/src/net/sf/openrocket/android/thrustcurve/RaspBurnFile.java b/src/net/sf/openrocket/android/thrustcurve/RaspBurnFile.java
new file mode 100644
index 00000000..2c2e834e
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/RaspBurnFile.java
@@ -0,0 +1,85 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.StringReader;
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import android.util.Log;
+
+
+class RaspBurnFile{
+
+	private final static String TAG = "RaspBurnFile";
+	
+	private final static int HEADER = 0;
+	private final static int DATA = 1;
+	private final static Pattern headerPattern = Pattern.compile("(\\S*)\\s+(\\S*)\\s+(\\S*)\\s+(\\S*)\\s+(\\S*)\\s+(\\S*)\\s+(\\S*)");
+	private final static Pattern dataPattern = Pattern.compile("(\\S*)\\s+(\\S*)");
+	
+	static void parse( MotorBurnFile that, String filecontents ) {
+		
+		int state = HEADER;
+		
+		LineNumberReader reader = new LineNumberReader( new StringReader(filecontents));
+		
+		Vector<Double> datapoints = new Vector<Double>();
+		
+		String line;
+		Matcher m;
+		try {
+		while ( (line = reader.readLine()) != null ) {
+			line = line.trim();
+			Log.d("RASP",line);
+			if ( line.startsWith(";")) {
+				continue;
+			}
+			switch (state) {
+			
+			case HEADER:
+				Log.d("RASP","header");
+				m = headerPattern.matcher(line);
+				if ( m.matches() ) {
+					Log.d("RASP","header matches");
+					
+					/*motorName = m.group(1);*/
+					/*diameter = Integer.decode(m.group(2));*/
+					that.setLength(Float.parseFloat(m.group(3)) );
+					String delays = m.group(4);
+					if ( delays != null ) {
+						delays = delays.replace("-", ",");
+						that.setDelays(delays);
+					}
+					that.setPropWeightG(Double.parseDouble(m.group(5))*1000.0);
+					that.setTotWeightG(Double.parseDouble(m.group(6))*1000.0);
+					/*manufacturer = m.group(7);*/
+					
+				}
+				state = DATA;
+				break;
+				
+			case DATA:
+				Log.d("RASP","data");
+				m = dataPattern.matcher(line);
+				if ( m.matches() ) {
+					Log.d("RASP","data matches");
+					Double x = Double.parseDouble(m.group(1));
+					Double y = Double.parseDouble(m.group(2));
+					Log.d("RASP","data matches ("+x+","+y+")");
+					datapoints.add(x);
+					datapoints.add(y);
+				}
+				break;
+			}
+			that.setDatapoints(datapoints);
+		}
+		} catch (IOException ex ) {
+			Log.d(TAG,"Unable to parse Rasp file: " + ex);
+		}
+		
+	}
+	
+
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/SearchRequest.java b/src/net/sf/openrocket/android/thrustcurve/SearchRequest.java
new file mode 100644
index 00000000..681c049f
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/SearchRequest.java
@@ -0,0 +1,117 @@
+package net.sf.openrocket.android.thrustcurve;
+
+public class SearchRequest {
+
+	private String manufacturer;
+	private String designation;
+	private String brand_name;
+	
+	private String common_name;
+	private String impulse_class;
+	private Integer diameter;
+	
+	/*
+	public enum Type {
+		"SU";
+		"reload";
+		"hybrid"
+	};
+	*/
+	private String type;
+	
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = null;
+		if ( manufacturer != null ) {
+			manufacturer = manufacturer.trim();
+			if ( ! "".equals(manufacturer) ) {
+				this.manufacturer = manufacturer;
+			}
+		}
+	}
+
+	public void setDesignation(String designation) {
+		this.designation = designation;
+	}
+
+	public void setBrand_name(String brand_name) {
+		this.brand_name = brand_name;
+	}
+
+	public void setCommon_name(String common_name) {
+		if ( common_name == null ) {
+			this.common_name = null;
+			return;
+		}
+		this.common_name = common_name.trim();
+		if ( "".equals(this.common_name)) {
+			this.common_name = null;
+		}
+	}
+
+	public void setImpulse_class(String impulse_class) {
+		this.impulse_class = null;
+		if ( impulse_class != null ) {
+			this.impulse_class = impulse_class.trim();
+			if ( "".equals(impulse_class) ) {
+				this.impulse_class = null;
+			}
+		}
+	}
+
+	public void setDiameter(Integer diameter) {
+		this.diameter = diameter;
+	}
+	
+	public void setDiameter(String diameter) {
+		this.diameter = null;
+		if ( diameter == null ) {
+			return;
+		}
+		try {
+			this.diameter = Integer.decode(diameter);
+		} catch ( NumberFormatException ex ) {
+			this.diameter = null;
+		}
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder w = new StringBuilder();
+		
+        w.append("<?xml version=\"1.0\" encoding=\"ascii\"?>\n");
+        w.append("<search-request\n");
+        w.append(" xmlns=\"http://www.thrustcurve.org/2011/SearchRequest\"\n");
+        w.append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
+        w.append(" xsi:schemaLocation=\"http://www.thrustcurve.org/2011/SearchRequest http://www.thrustcurve.org/2011/search-request.xsd\">\n");
+
+        if ( manufacturer != null ) {
+            w.append("  <manufacturer>").append(manufacturer).append("</manufacturer>\n");
+        }
+        if ( designation != null ) {
+            w.append("  <designation>").append(designation).append("</designation>\n");
+        }
+        if ( brand_name != null ) {
+            w.append("  <brand-name>").append(brand_name).append("</brand-name>\n");
+        }
+        if ( common_name != null ) {
+            w.append("  <common-name>").append(common_name).append("</common-name>\n");
+        }
+        if ( impulse_class != null ) {
+            w.append("  <impulse-class>").append(impulse_class).append("</impulse-class>\n");
+        }
+        if ( diameter != null ) {
+            w.append("  <diameter>").append(diameter).append("</diameter>\n");
+        }
+        if ( type != null ) {
+            w.append("  <type>").append(type).append("</type>\n");
+        }
+        w.append("<data-fields>*</data-fields>");
+        w.append("<max-results>50</max-results>");
+        w.append("</search-request>\n");
+		return w.toString();
+	}
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/SearchResponse.java b/src/net/sf/openrocket/android/thrustcurve/SearchResponse.java
new file mode 100644
index 00000000..48cbfefb
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/SearchResponse.java
@@ -0,0 +1,45 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SearchResponse {
+
+	private List<TCMotor> results = new ArrayList<TCMotor>();
+	
+	private int matches;
+	
+	private String error;
+
+	public List<TCMotor> getResults() {
+		return results;
+	}
+
+	public void setResults(List<TCMotor> results) {
+		this.results = results;
+	}
+
+	public int getMatches() {
+		return matches;
+	}
+
+	public void setMatches(int matches) {
+		this.matches = matches;
+	}
+
+	public String getError() {
+		return error;
+	}
+
+	public void setError(String error) {
+		this.error = error;
+	}
+
+	@Override
+	public String toString() {
+		return "SearchResult [results=" + results + ", matches=" + matches
+				+ ", error=" + error + "]";
+	}
+	
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/SearchResponseParser.java b/src/net/sf/openrocket/android/thrustcurve/SearchResponseParser.java
new file mode 100644
index 00000000..be532435
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/SearchResponseParser.java
@@ -0,0 +1,281 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.io.InputStream;
+
+import org.xml.sax.Attributes;
+
+import android.sax.Element;
+import android.sax.EndElementListener;
+import android.sax.EndTextElementListener;
+import android.sax.RootElement;
+import android.sax.StartElementListener;
+import android.util.Xml;
+
+public class SearchResponseParser {
+
+	private static final String thrustcurveURI = "http://www.thrustcurve.org/2008/SearchResponse";
+	/*
+	 * XML Tags in SearchResult xsd
+	 */
+	private static final String root_tag = "search-response";
+	private static final String criteria = "criteria";
+	private static final String criterion = "criterion";
+	private static final String name = "name";
+	private static final String value = "value";
+	private static final String matches = "matches";
+	private static final String results = "results";
+	private static final String result = "result";
+	
+	private static final String motor_id = "motor-id";
+	private static final String manufacturer = "manufacturer";
+	private static final String manufacturer_abbr = "manufacturer-abbrev";
+	private static final String designation = "designation";
+	private static final String brand_name = "brand-name";
+	private static final String common_name = "common-name";
+	private static final String impulse_class = "impulse-class";
+	private static final String diameter = "diameter";
+	private static final String length = "length";
+	private static final String type = "type";
+	private static final String cert_org = "cert-org";
+	private static final String avg_thrust_n = "avg-thrust-n";
+	private static final String max_thrust_n = "max-thrust-n";
+	private static final String tot_impulse_ns = "tot-impulse-ns";
+	private static final String burn_time_s = "burn-time-s";
+	private static final String data_files = "data-files";
+	private static final String info_url = "info-url";
+	private static final String total_weight_g = "total-weight-g";
+	private static final String prop_weight_g = "prop-weight-g";
+	private static final String delays = "delays";
+	private static final String case_info = "case-info";
+	private static final String prop_info = "prop-info";
+	private static final String updated_on = "updated-on";
+	
+	public static SearchResponse parse( InputStream in ) {
+		
+		final SearchResponse ret = new SearchResponse();
+		final TCMotor currentMotor = new TCMotor();
+
+		RootElement rootEl = new RootElement(thrustcurveURI, root_tag);
+		Element criteriaEl = rootEl.getChild( thrustcurveURI, criteria);
+		
+		criteriaEl.getChild(thrustcurveURI,matches).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						ret.setMatches(Integer.parseInt(arg0));
+					}
+				}
+		);
+		Element resultsEl = rootEl.getChild(thrustcurveURI,results);
+		Element resultEl = resultsEl.getChild(thrustcurveURI,result);
+
+		resultEl.setStartElementListener(
+				new StartElementListener() {
+					@Override
+					public void start(Attributes arg0) {
+						currentMotor.init();
+					}
+				}
+		);
+		
+		resultEl.setEndElementListener(
+				new EndElementListener() {
+					@Override
+					public void end() {
+						ret.getResults().add((TCMotor)currentMotor.clone());
+					}
+				}
+		);
+		
+		resultEl.getChild(thrustcurveURI,motor_id).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setMotor_id(Integer.parseInt(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,manufacturer).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						if ( arg0 != null ) {
+							currentMotor.setManufacturer(arg0);
+						}
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,manufacturer_abbr).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						if ( arg0 != null ) {
+							currentMotor.setManufacturer_abbr(arg0);
+						}
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,designation).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setDesignation(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,brand_name).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setBrand_name(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,common_name).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setCommon_name(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,impulse_class).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setImpulse_class(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,diameter).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setDiameter(Float.parseFloat(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,length).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setLength(Float.parseFloat(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,type).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setType(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,cert_org).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setCert_org(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,avg_thrust_n).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setAvg_thrust_n(Float.parseFloat(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,max_thrust_n).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setMax_thrust_n(Float.parseFloat(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,tot_impulse_ns).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setTot_impulse_ns(Float.parseFloat(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,burn_time_s).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setBurn_time_s(Float.parseFloat(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,data_files).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setData_files(Integer.parseInt(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,info_url).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setInfo_url(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,total_weight_g).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setTot_mass_g(Double.parseDouble(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,prop_weight_g).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setProp_mass_g(Double.parseDouble(arg0));
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,delays).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setDelays(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,case_info).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setCase_info(arg0);
+					}
+				}
+		);
+		resultEl.getChild(thrustcurveURI,prop_info).setEndTextElementListener(
+				new EndTextElementListener() {
+					@Override
+					public void end(String arg0) {
+						currentMotor.setProp_info(arg0);
+					}
+				}
+		);
+
+
+        try {
+            Xml.parse(in, Xml.Encoding.UTF_8,  rootEl.getContentHandler());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+		return ret;
+	}
+	
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/SupportedFileTypes.java b/src/net/sf/openrocket/android/thrustcurve/SupportedFileTypes.java
new file mode 100644
index 00000000..c1230164
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/SupportedFileTypes.java
@@ -0,0 +1,11 @@
+package net.sf.openrocket.android.thrustcurve;
+
+public abstract class SupportedFileTypes {
+
+	public final static String ROCKSIM_FORMAT = "RockSim";
+	public final static String RASP_FORMAT = "RASP";
+	
+	public static boolean isSupportedFileType( String arg0 ) {
+		return (ROCKSIM_FORMAT.equals(arg0) || RASP_FORMAT.equals(arg0));
+	}
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/TCMotor.java b/src/net/sf/openrocket/android/thrustcurve/TCMotor.java
new file mode 100644
index 00000000..477029ec
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/TCMotor.java
@@ -0,0 +1,299 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.util.Date;
+import java.util.Vector;
+
+public class TCMotor implements Cloneable {
+
+	private Integer motor_id;
+	private String manufacturer;
+	private String manufacturer_abbr;
+	private String designation;
+	private String brand_name;
+	private String common_name;
+	private String impulse_class;
+	private Float diameter;
+	private Float length;
+	private String type;
+	private String cert_org;
+	private Float avg_thrust_n;
+	private Float max_thrust_n;
+	private Float tot_impulse_ns;
+	private Float burn_time_s;
+	private Integer data_files;
+	private String info_url;
+	private Double tot_mass_g;
+	private Double prop_mass_g;
+	private String delays;
+	private String case_info;
+	private String prop_info;
+	private Date updated_on;
+	private Vector<Double> burndata;
+	
+	public void init() {
+		motor_id = null;
+		manufacturer = null;
+		manufacturer_abbr = null;
+		designation = null;
+		brand_name = null;
+		common_name = null;
+		impulse_class = null;
+		diameter = null;
+		length = null;
+		type = null;
+		cert_org = null;
+		avg_thrust_n = null;
+		max_thrust_n = null;
+		tot_impulse_ns = null;
+		burn_time_s = null;
+		data_files = null;
+		info_url = null;
+		tot_mass_g = null;
+		prop_mass_g = null;
+		delays = null;
+		case_info = null;
+		prop_info = null;
+		updated_on = null;
+		burndata = null;
+	}
+	
+	@Override
+	public TCMotor clone() {
+		TCMotor clone = new TCMotor();
+		clone.motor_id = this.motor_id;
+		clone.manufacturer = this.manufacturer;
+		clone.manufacturer_abbr = this.manufacturer_abbr;
+		clone.designation = this.designation;
+		clone.brand_name = this.brand_name;
+		clone.common_name = this.common_name;
+		clone.impulse_class = this.impulse_class;
+		clone.diameter = this.diameter;
+		clone.length = this.length;
+		clone.type = this.type;
+		clone.cert_org = this.cert_org;
+		clone.avg_thrust_n = this.avg_thrust_n;
+		clone.max_thrust_n = this.max_thrust_n;
+		clone.tot_impulse_ns = this.tot_impulse_ns;
+		clone.burn_time_s = this.burn_time_s;
+		clone.data_files = this.data_files;
+		clone.info_url = this.info_url;
+		clone.tot_mass_g = this.tot_mass_g;
+		clone.prop_mass_g = this.prop_mass_g;
+		clone.delays = this.delays;
+		clone.case_info = this.case_info;
+		clone.prop_info = this.prop_info;
+		clone.updated_on = this.updated_on;
+		clone.burndata = this.burndata;
+		return clone;
+	}
+
+	public Integer getMotor_id() {
+		return motor_id;
+	}
+
+	public void setMotor_id(Integer motor_id) {
+		this.motor_id = motor_id;
+	}
+
+	public String getManufacturer() {
+		return manufacturer;
+	}
+
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+
+	public String getManufacturer_abbr() {
+		return manufacturer_abbr;
+	}
+
+	public void setManufacturer_abbr(String manufacturer_abbr) {
+		this.manufacturer_abbr = manufacturer_abbr;
+	}
+
+	public String getDesignation() {
+		return designation;
+	}
+
+	public void setDesignation(String designation) {
+		this.designation = designation;
+	}
+
+	public String getBrand_name() {
+		return brand_name;
+	}
+
+	public void setBrand_name(String brand_name) {
+		this.brand_name = brand_name;
+	}
+
+	public String getCommon_name() {
+		return common_name;
+	}
+
+	public void setCommon_name(String common_name) {
+		this.common_name = common_name;
+	}
+
+	public String getImpulse_class() {
+		return impulse_class;
+	}
+
+	public void setImpulse_class(String impulse_class) {
+		this.impulse_class = impulse_class;
+	}
+
+	public Float getDiameter() {
+		return diameter;
+	}
+
+	public void setDiameter(Float diameter) {
+		this.diameter = diameter;
+	}
+
+	public Float getLength() {
+		return length;
+	}
+
+	public void setLength(Float length) {
+		this.length = length;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getCert_org() {
+		return cert_org;
+	}
+
+	public void setCert_org(String cert_org) {
+		this.cert_org = cert_org;
+	}
+
+	public Float getAvg_thrust_n() {
+		return avg_thrust_n;
+	}
+
+	public void setAvg_thrust_n(Float avg_thrust_n) {
+		this.avg_thrust_n = avg_thrust_n;
+	}
+
+	public Float getMax_thrust_n() {
+		return max_thrust_n;
+	}
+
+	public void setMax_thrust_n(Float max_thrust_n) {
+		this.max_thrust_n = max_thrust_n;
+	}
+
+	public Float getTot_impulse_ns() {
+		return tot_impulse_ns;
+	}
+
+	public void setTot_impulse_ns(Float tot_impulse_ns) {
+		this.tot_impulse_ns = tot_impulse_ns;
+	}
+
+	public Float getBurn_time_s() {
+		return burn_time_s;
+	}
+
+	public void setBurn_time_s(Float burn_time_s) {
+		this.burn_time_s = burn_time_s;
+	}
+
+	public Integer getData_files() {
+		return data_files;
+	}
+
+	public void setData_files(Integer data_files) {
+		this.data_files = data_files;
+	}
+
+	public String getInfo_url() {
+		return info_url;
+	}
+
+	public void setInfo_url(String info_url) {
+		this.info_url = info_url;
+	}
+
+	public Double getTot_mass_g() {
+		return tot_mass_g;
+	}
+
+	public void setTot_mass_g(Double tot_mass_g) {
+		this.tot_mass_g = tot_mass_g;
+	}
+
+	public Double getProp_mass_g() {
+		return prop_mass_g;
+	}
+
+	public void setProp_mass_g(Double prop_mass_g) {
+		this.prop_mass_g = prop_mass_g;
+	}
+
+	public String getDelays() {
+		return delays;
+	}
+
+	public void setDelays(String delays) {
+		this.delays = delays;
+	}
+
+	public String getCase_info() {
+		return case_info;
+	}
+
+	public void setCase_info(String case_info) {
+		this.case_info = case_info;
+	}
+
+	public String getProp_info() {
+		return prop_info;
+	}
+
+	public void setProp_info(String prop_info) {
+		this.prop_info = prop_info;
+	}
+
+	public Date getUpdated_on() {
+		return updated_on;
+	}
+
+	public void setUpdated_on(Date updated_on) {
+		this.updated_on = updated_on;
+	}
+
+	public Vector<Double> getBurndata() {
+		return burndata;
+	}
+
+	public void setBurndata(Vector<Double> burndata) {
+		this.burndata = burndata;
+	}
+
+	@Override
+	public String toString() {
+		return "TCMotor [motor_id=" + motor_id + ", manufacturer="
+				+ manufacturer + ", manufacturer_abbr=" + manufacturer_abbr
+				+ ", designation=" + designation + ", brand_name=" + brand_name
+				+ ", common_name=" + common_name + ", impulse_class="
+				+ impulse_class + ", diameter=" + diameter + ", length="
+				+ length + ", type=" + type + ", cert_org=" + cert_org
+				+ ", avg_thrust_n=" + avg_thrust_n + ", max_thrust_n="
+				+ max_thrust_n + ", tot_impulse_ns=" + tot_impulse_ns
+				+ ", burn_time_s=" + burn_time_s + ", data_files=" + data_files
+				+ ", info_url=" + info_url + ", tot_mass_g=" + tot_mass_g
+				+ ", prop_mass_g=" + prop_mass_g + ", delays=" + delays
+				+ ", case_info=" + case_info + ", prop_info=" + prop_info
+				+ ", updated_on=" + updated_on + "]";
+	}
+	
+}
diff --git a/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java b/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
new file mode 100644
index 00000000..8f5a7835
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
@@ -0,0 +1,256 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.util.Vector;
+
+import net.sf.openrocket.R;
+import net.sf.openrocket.android.db.DbAdapter;
+import net.sf.openrocket.android.motor.Motor;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Spinner;
+
+public class TCQueryActivity extends Activity {
+
+	private static final String TAG = "ThrustCurveQueryActivity";
+
+	private DbAdapter mDbHelper;
+
+	private ProgressDialog progress;
+	private Thread downloadThread;
+	private Handler handler;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.tcqueryform);
+
+		mDbHelper = new DbAdapter(this);
+		mDbHelper.open();
+
+		final Spinner manufacturerField = (Spinner) findViewById(R.id.TCMotorSearchFormManufacturerField);
+		final Spinner impulseField = (Spinner) findViewById(R.id.TCMotorSearchFormImpulseField);
+		final Spinner diameterField = (Spinner) findViewById(R.id.TCMotorSearchFormDiameterField);
+		final EditText commonNameField = (EditText) findViewById(R.id.TCMotorSearchFormCommonNameField);
+
+		Button submitButton = (Button) findViewById(R.id.TCMotorSearchFromSubmitButton);
+		submitButton.setOnClickListener(
+				new View.OnClickListener() {
+					@Override
+					public void onClick( View v ) {
+						Log.d(TAG,"submit button clicked");
+
+						String commonName = commonNameField.getText().toString();
+
+						SearchRequest r = new SearchRequest();
+						if ( manufacturerField.getSelectedItemPosition() != 0) {
+							String m = (String) manufacturerField.getSelectedItem();
+							Log.d(TAG,"manufacturer = " + m);
+							r.setManufacturer(m);
+						}
+						if ( impulseField.getSelectedItemPosition() != 0  ) {
+							String impulse = (String) impulseField.getSelectedItem();
+							Log.d(TAG,"impulse = " + impulse);
+							r.setImpulse_class(impulse);
+						}
+						if ( diameterField.getSelectedItemPosition() != 0 ) {
+							String diameter = (String)diameterField.getSelectedItem();
+							Log.d(TAG,"diameter = " + diameter);
+							r.setDiameter(diameter);
+						}
+						r.setCommon_name(commonName);
+
+						Downloader d = new Downloader(r);
+
+						handler = new Handler();
+						progress = ProgressDialog.show(TCQueryActivity.this, null, "");
+
+						downloadThread = new Thread( d );
+						downloadThread.start();
+					}
+				}
+				);
+	}
+
+	@Override
+	public Object onRetainNonConfigurationInstance() {
+		return downloadThread;
+	}
+
+	@Override
+	protected void onDestroy() {
+		mDbHelper.close();
+		if ( progress != null ) {
+			if ( progress.isShowing() ) {
+				progress.dismiss();
+			}
+			progress = null;
+		}
+		super.onDestroy();
+	}
+
+	private class UpdateMessage implements Runnable {
+		private String newMessage;
+		UpdateMessage( String message ) {
+			this.newMessage = message;
+		}
+		@Override
+		public void run() {
+			progress.setMessage(newMessage);
+		}
+	}
+
+	private class Dismiss implements Runnable {
+		@Override
+		public void run() {
+			progress.dismiss();
+			TCQueryActivity.this.finish();
+		}
+	}
+
+	private class Error implements Runnable {
+		private String newMessage;
+		Error( String message ) {
+			this.newMessage = message;
+		}
+		@Override
+		public void run() {
+			progress.dismiss();
+			final AlertDialog dialog = new AlertDialog.Builder(TCQueryActivity.this).create();
+			dialog.setMessage(newMessage);
+			dialog.setButton(DialogInterface.BUTTON_NEUTRAL,"Dismiss", new DialogInterface.OnClickListener() {
+
+				@Override
+				public void onClick(DialogInterface arg0, int arg1) {
+					dialog.dismiss();
+				}
+
+			});
+			dialog.show();
+		}
+	}
+	private class Downloader implements Runnable {
+
+		SearchRequest request;
+
+		Downloader( SearchRequest request ) {
+			this.request = request;
+		}
+
+		@Override
+		public void run() {
+			try {
+				handler.post( new UpdateMessage("Quering Thrustcurve"));
+				SearchResponse res = new ThrustCurveAPI().doSearch(request);
+
+				int total = res.getResults().size();
+				int count = 1;
+				for( TCMotor mi : res.getResults() ) {
+					handler.post(new UpdateMessage("Downloading details " + count + " of " + total));
+					count++;
+					if ( mi.getData_files() == null || mi.getData_files().intValue() == 0 ) {
+						continue;
+					}
+
+					MotorBurnFile b = new ThrustCurveAPI().downloadData(mi.getMotor_id());
+
+					if ( b != null ) {
+						if ( b.getLength() != null ) {
+							mi.setLength( b.getLength() );
+						}
+						if ( b.getPropWeightG() != null ) {
+							mi.setProp_mass_g(b.getPropWeightG());
+						}
+						if ( b.getTotWeightG() != null ) {
+							mi.setTot_mass_g(b.getTotWeightG());
+						}
+						if ( b.getDelays() != null ) {
+							mi.setDelays(b.getDelays());
+						}
+						mi.setBurndata(b.getDatapoints());
+					}
+					Log.d(TAG, mi.toString());
+
+					// convert to Motors.  One per delay.
+					Motor m = new Motor();
+					// Base name of motor.
+					String name = mi.getCommon_name() + "-";
+
+					m.setManufacturer(mi.getManufacturer_abbr());
+					// Convert impulse class.  ThrustCurve puts mmx, 1/4a and 1/2a as A.
+					m.setImpulseClass(mi.getImpulse_class());
+					if ( "a".equalsIgnoreCase(mi.getImpulse_class())) {
+						if( mi.getCommon_name().startsWith("1/2A") ) {
+							m.setImpulseClass("1/2A");
+						} else if (mi.getCommon_name().startsWith("1/4A") ) {
+							m.setImpulseClass("1/4A");
+						} else if (mi.getCommon_name().startsWith("Micro") ) {
+							m.setImpulseClass("1/8A");
+						}
+					}
+					m.setAvgThrust(mi.getAvg_thrust_n());
+					m.setBurndata(mi.getBurndata());
+					m.setBurnTime(mi.getBurn_time_s());
+					m.setDiameter(mi.getDiameter() == null ? null : mi.getDiameter().longValue());
+					m.setLength(mi.getLength());
+					m.setMaxThrust(mi.getMax_thrust_n());
+					m.setPropMass(mi.getProp_mass_g());
+					m.setTotalImpulse(mi.getTot_impulse_ns());
+					m.setTotMass(mi.getTot_mass_g());
+					// Convert Case Info.
+					if ( mi.getCase_info() == null
+							|| "single use".equalsIgnoreCase(mi.getCase_info())
+							|| "single-use".equalsIgnoreCase(mi.getCase_info())) {
+						m.setCaseInfo(mi.getType()+ " " + mi.getDiameter() + "x" + mi.getLength());
+					} else {
+						m.setCaseInfo(mi.getCase_info());
+					}
+
+					Vector<String> delays = new Vector<String>();
+					{
+						String delaysString = mi.getDelays();
+						if ( delaysString != null ) {
+							delaysString = delaysString.trim();
+						}
+
+						if ( delaysString == null || "".equals(delaysString)) {
+							delays.add("");
+						} else {
+							String[] delayString = delaysString.split(",");
+							for( String d : delayString )  {
+								delays.add( d.trim() );
+							}
+						}
+					}
+
+					for( String d: delays ) {
+						if ( "100".equals(d) ) {
+							m.setName(name + "P");
+						} else {
+							m.setName(name + d);
+						}
+						mDbHelper.getMotorDao().insertOrUpdateMotor(m);
+					}
+				}
+				if ( total < res.getMatches() ) {
+					handler.post( new Error( total + " motors downloaded, " + res.getMatches() + " matched.  Try restricting the query more.") );
+				} else {
+					handler.post( new Dismiss());
+				}
+			}
+			catch( Exception ex){
+				Log.d(TAG,ex.toString());
+				handler.post( new Error(ex.toString()) );
+			}
+
+		}
+	}
+}
+
diff --git a/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java b/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
new file mode 100644
index 00000000..9241228b
--- /dev/null
+++ b/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
@@ -0,0 +1,80 @@
+package net.sf.openrocket.android.thrustcurve;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import android.util.Log;
+
+
+public class ThrustCurveAPI {
+
+	private final static String TAG = "ThrustCurveAPI";
+	
+	private String url_base = "http://www.thrustcurve.org/servlets/";
+	
+	public SearchResponse doSearch( SearchRequest request ) throws MalformedURLException, IOException {
+		
+		String requestString = request.toString();
+		
+		Log.d(TAG, "doSearch: " + requestString);
+		URL url = new URL(url_base + "search");
+
+        OutputStream  stream;
+
+        URLConnection conn = url.openConnection();
+        conn.setConnectTimeout(2000);
+        conn.setDoInput(true);
+        conn.setDoOutput(true);
+        conn.setUseCaches(false);
+
+        stream = conn.getOutputStream();
+
+        stream.write(requestString.getBytes());
+        
+        InputStream is = conn.getInputStream();
+
+        SearchResponse result = SearchResponseParser.parse(is);
+        Log.d(TAG,result.toString());
+        
+        return result;
+	}
+
+	public MotorBurnFile downloadData( Integer motor_id ) throws MalformedURLException, IOException {
+
+		if ( motor_id == null ) {
+			return null;
+		}
+		DownloadRequest dr = new DownloadRequest();
+		dr.add(motor_id);
+
+		String requestString = dr.toString();
+
+		Log.d(TAG, "downloadData: " + requestString);
+		URL url = new URL(url_base + "download");
+
+		OutputStream  stream;
+
+		URLConnection conn = url.openConnection();
+		conn.setDoInput(true);
+		conn.setDoOutput(true);
+		conn.setUseCaches(false);
+
+		stream = conn.getOutputStream();
+
+		stream.write(requestString.getBytes());
+
+		InputStream is = conn.getInputStream();
+
+		DownloadResponse downloadResponse = DownloadResponseParser.parse(is);
+		Log.d(TAG,downloadResponse.toString());
+
+		MotorBurnFile mbf = downloadResponse.getData(motor_id);
+
+		return mbf;
+
+    }
+}
diff --git a/src/net/sf/openrocket/database/MotorDatabase.java b/src/net/sf/openrocket/database/MotorDatabase.java
new file mode 100644
index 00000000..fdde5fac
--- /dev/null
+++ b/src/net/sf/openrocket/database/MotorDatabase.java
@@ -0,0 +1,24 @@
+package net.sf.openrocket.database;
+
+import java.util.List;
+
+import net.sf.openrocket.motor.Motor;
+
+public interface MotorDatabase {
+
+	/**
+	 * Return all motors in the database matching a search criteria.  Any search criteria that
+	 * is null or NaN is ignored.
+	 * 
+	 * @param type			the motor type, or null.
+	 * @param manufacturer	the manufacturer, or null.
+	 * @param designation	the designation, or null.
+	 * @param diameter		the diameter, or NaN.
+	 * @param length		the length, or NaN.
+	 * @return				a list of all the matching motors.
+	 */
+	public List<? extends Motor> findMotors(Motor.Type type,
+			String manufacturer, String designation, double diameter,
+			double length);
+
+}
\ No newline at end of file
diff --git a/src/net/sf/openrocket/database/ThrustCurveMotorSet.java b/src/net/sf/openrocket/database/ThrustCurveMotorSet.java
index 99c422e3..321e42b2 100644
--- a/src/net/sf/openrocket/database/ThrustCurveMotorSet.java
+++ b/src/net/sf/openrocket/database/ThrustCurveMotorSet.java
@@ -19,7 +19,7 @@ import net.sf.openrocket.motor.ThrustCurveMotor;
 import net.sf.openrocket.util.ArrayList;
 import net.sf.openrocket.util.MathUtil;
 
-public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
+class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
 	
 	//  Comparators:
 	private static final Collator COLLATOR = Collator.getInstance(Locale.US);
diff --git a/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java b/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java
index d1511595..1aeb6cd4 100644
--- a/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java
+++ b/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java
@@ -15,7 +15,7 @@ import net.sf.openrocket.startup.Application;
  * 
  * @author Sampo Niskanen <sampo.niskanen@iki.fi>
  */
-public abstract class ThrustCurveMotorSetDatabase {
+public abstract class ThrustCurveMotorSetDatabase implements MotorDatabase {
 	
 	private static final LogHelper logger = Application.getLogger();
 	
@@ -38,11 +38,8 @@ public abstract class ThrustCurveMotorSetDatabase {
 	}
 	
 	
-	/**
-	 * Return a list of the ThrustCurveMotorSet objects.  The list is in sorted order and
-	 * is unmodifiable.
-	 * 
-	 * @return		the list of all ThrustCurveMotorSets.
+	/* (non-Javadoc)
+	 * @see net.sf.openrocket.database.ThrustCurveMotorSetDatabaseI#getMotorSets()
 	 */
 	public List<ThrustCurveMotorSet> getMotorSets() {
 		blockUntilLoaded();
@@ -51,17 +48,10 @@ public abstract class ThrustCurveMotorSetDatabase {
 	
 	
 
-	/**
-	 * Return all motors in the database matching a search criteria.  Any search criteria that
-	 * is null or NaN is ignored.
-	 * 
-	 * @param type			the motor type, or null.
-	 * @param manufacturer	the manufacturer, or null.
-	 * @param designation	the designation, or null.
-	 * @param diameter		the diameter, or NaN.
-	 * @param length		the length, or NaN.
-	 * @return				a list of all the matching motors.
+	/* (non-Javadoc)
+	 * @see net.sf.openrocket.database.ThrustCurveMotorSetDatabaseI#findMotors(net.sf.openrocket.motor.Motor.Type, java.lang.String, java.lang.String, double, double)
 	 */
+	@Override
 	public List<ThrustCurveMotor> findMotors(Motor.Type type, String manufacturer, String designation,
 			double diameter, double length) {
 		blockUntilLoaded();
diff --git a/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
index 26400c0b..c4fc7d73 100644
--- a/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
+++ b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
@@ -999,7 +999,7 @@ class MotorHandler extends ElementHandler {
 			return null;
 		}
 		
-		List<ThrustCurveMotor> motors = Application.getMotorSetDatabase().findMotors(type, manufacturer,
+		List<? extends Motor> motors = Application.getMotorSetDatabase().findMotors(type, manufacturer,
 				designation, diameter, length);
 		
 		// No motors
@@ -1014,7 +1014,7 @@ class MotorHandler extends ElementHandler {
 		
 		// One motor
 		if (motors.size() == 1) {
-			ThrustCurveMotor m = motors.get(0);
+			Motor m = motors.get(0);
 			if (digest != null && !MotorDigest.digestMotor(m).equals(digest)) {
 				String str = "Motor with designation '" + designation + "'";
 				if (manufacturer != null)
@@ -1029,7 +1029,7 @@ class MotorHandler extends ElementHandler {
 		if (digest != null) {
 			
 			// Check for motor with correct digest
-			for (ThrustCurveMotor m : motors) {
+			for (Motor m : motors) {
 				if (MotorDigest.digestMotor(m).equals(digest)) {
 					return m;
 				}
@@ -1044,7 +1044,7 @@ class MotorHandler extends ElementHandler {
 			
 			// No digest, check for preferred digest (OpenRocket <= 1.1.0)
 			// TODO: MEDIUM: This should only be done for document versions 1.1 and below
-			for (ThrustCurveMotor m : motors) {
+			for (Motor m : motors) {
 				if (PreferredMotorDigests.DIGESTS.contains(MotorDigest.digestMotor(m))) {
 					return m;
 				}
diff --git a/src/net/sf/openrocket/motor/Motor.java b/src/net/sf/openrocket/motor/Motor.java
index ae83e7c4..fda0eebb 100644
--- a/src/net/sf/openrocket/motor/Motor.java
+++ b/src/net/sf/openrocket/motor/Motor.java
@@ -126,5 +126,8 @@ public interface Motor {
 	public double getMaxThrustEstimate();
 	public double getTotalImpulseEstimate();
 	
+	public double[] getTimePoints();
+	public double[] getThrustPoints();
+	public Coordinate[] getCGPoints();
 	
 }
diff --git a/src/net/sf/openrocket/motor/MotorDigest.java b/src/net/sf/openrocket/motor/MotorDigest.java
index cec3cbdc..e50cbf9f 100644
--- a/src/net/sf/openrocket/motor/MotorDigest.java
+++ b/src/net/sf/openrocket/motor/MotorDigest.java
@@ -138,7 +138,7 @@ public class MotorDigest {
 	 * @param m		the motor to digest
 	 * @return		the digest
 	 */
-	public static String digestMotor(ThrustCurveMotor m) {
+	public static String digestMotor(Motor m) {
 		
 		// Create the motor digest from data available in RASP files
 		MotorDigest motorDigest = new MotorDigest();
diff --git a/src/net/sf/openrocket/motor/ThrustCurveMotor.java b/src/net/sf/openrocket/motor/ThrustCurveMotor.java
index a51283ea..1f8acd2a 100644
--- a/src/net/sf/openrocket/motor/ThrustCurveMotor.java
+++ b/src/net/sf/openrocket/motor/ThrustCurveMotor.java
@@ -1,5 +1,6 @@
 package net.sf.openrocket.motor;
 
+import java.io.Serializable;
 import java.text.Collator;
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/src/net/sf/openrocket/startup/Application.java b/src/net/sf/openrocket/startup/Application.java
index 9ced3a34..7718b67e 100644
--- a/src/net/sf/openrocket/startup/Application.java
+++ b/src/net/sf/openrocket/startup/Application.java
@@ -1,6 +1,6 @@
 package net.sf.openrocket.startup;
 
-import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
+import net.sf.openrocket.database.MotorDatabase;
 import net.sf.openrocket.l10n.ClassBasedTranslator;
 import net.sf.openrocket.l10n.DebugTranslator;
 import net.sf.openrocket.l10n.ExceptionSuppressingTranslator;
@@ -22,7 +22,7 @@ public final class Application {
 	
 	private static Translator baseTranslator = new DebugTranslator(null);
 	
-	private static ThrustCurveMotorSetDatabase motorSetDatabase;
+	private static MotorDatabase motorSetDatabase;
 
 	private static Preferences preferences;
 	
@@ -149,14 +149,14 @@ public final class Application {
 	/**
 	 * Return the database of all thrust curves loaded into the system.
 	 */
-	public static ThrustCurveMotorSetDatabase getMotorSetDatabase() {
+	public static MotorDatabase getMotorSetDatabase() {
 		return motorSetDatabase;
 	}
 	
 	/**
 	 * Set the database of thrust curves loaded into the system.
 	 */
-	public static void setMotorSetDatabase(ThrustCurveMotorSetDatabase motorSetDatabase) {
+	public static void setMotorSetDatabase(MotorDatabase motorSetDatabase) {
 		Application.motorSetDatabase = motorSetDatabase;
 	}