diff --git a/sample_app/libs/EasyCursor-0.1.1.jar b/sample_app/libs/EasyCursor-0.1.1.jar
new file mode 100644
index 0000000..2e043b5
Binary files /dev/null and b/sample_app/libs/EasyCursor-0.1.1.jar differ
diff --git a/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java b/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java
index 3e0a043..eb3a5cd 100644
--- a/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java
+++ b/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java
@@ -6,6 +6,7 @@ import uk.co.alt236.btlescan.adapters.LeDeviceListAdapter;
 import uk.co.alt236.btlescan.containers.BluetoothLeDeviceStore;
 import uk.co.alt236.btlescan.util.BluetoothLeScanner;
 import uk.co.alt236.btlescan.util.BluetoothUtils;
+import uk.co.alt236.easycursor.objectcursor.EasyObjectCursor;
 import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.bluetooth.BluetoothAdapter;
@@ -39,12 +40,13 @@ public class MainActivity extends ListActivity {
 		public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) {
 
 			final BluetoothLeDevice deviceLe = new BluetoothLeDevice(device, rssi, scanRecord, System.currentTimeMillis());
+			mDeviceStore.addDevice(deviceLe);
+			final EasyObjectCursor<BluetoothLeDevice> c = mDeviceStore.getDeviceCursor();
 
 			runOnUiThread(new Runnable() {
 				@Override
 				public void run() {
-					mDeviceStore.addDevice(deviceLe);
-					mLeDeviceListAdapter.replaceData(mDeviceStore.getDeviceList());
+					mLeDeviceListAdapter.swapCursor(c);
 					updateItemCount(mLeDeviceListAdapter.getCount());
 				}
 			});
@@ -119,7 +121,7 @@ public class MainActivity extends ListActivity {
 
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
-		final BluetoothLeDevice device = mLeDeviceListAdapter.getItem(position);
+		final BluetoothLeDevice device = (BluetoothLeDevice) mLeDeviceListAdapter.getItem(position);
 		if (device == null) return;
 
 
@@ -181,7 +183,7 @@ public class MainActivity extends ListActivity {
 		mDeviceStore.clear();
 		updateItemCount(0);
 
-		mLeDeviceListAdapter = new LeDeviceListAdapter(this, mDeviceStore.getDeviceList());
+		mLeDeviceListAdapter = new LeDeviceListAdapter(this, mDeviceStore.getDeviceCursor());
 		setListAdapter(mLeDeviceListAdapter);
 
 		mBluetoothUtils.askUserToEnableBluetoothIfNeeded();
diff --git a/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java b/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java
index f73cedd..38d3892 100644
--- a/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java
+++ b/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java
@@ -1,34 +1,38 @@
 package uk.co.alt236.btlescan.adapters;
 
-import java.util.List;
-
 import uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice;
 import uk.co.alt236.bluetoothlelib.device.IBeaconDevice;
 import uk.co.alt236.bluetoothlelib.util.IBeaconUtils;
 import uk.co.alt236.btlescan.R;
 import uk.co.alt236.btlescan.util.Constants;
+import uk.co.alt236.easycursor.objectcursor.EasyObjectCursor;
 import android.app.Activity;
+import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 // Adapter for holding devices found through scanning.
-public class LeDeviceListAdapter extends ArrayAdapter<BluetoothLeDevice> {
+public class LeDeviceListAdapter extends SimpleCursorAdapter {
 	private final LayoutInflater mInflator;
 	private final Activity mActivity;
 
-	public LeDeviceListAdapter(Activity activity, List<BluetoothLeDevice> list) {
-		super(activity, R.layout.list_item_device, list);
+	public LeDeviceListAdapter(Activity activity, EasyObjectCursor<BluetoothLeDevice> cursor) {
+		super(activity, R.layout.list_item_device, cursor, new String[0], new int[0], 0);
 		mInflator = activity.getLayoutInflater();
 		mActivity = activity;
 	}
 
-	public void replaceData(List<BluetoothLeDevice> list){
-		// TODO: THIS IS REALLY HACKY AND BAD FOR PERFORMACE...
-		clear();
-		addAll(list);
+	@SuppressWarnings("unchecked")
+	@Override
+	public EasyObjectCursor<BluetoothLeDevice> getCursor(){
+		return ((EasyObjectCursor<BluetoothLeDevice>) super.getCursor());
+	}
+
+	@Override
+	public BluetoothLeDevice getItem(int i){
+		return getCursor().getItem(i);
 	}
 
 	@Override
@@ -60,7 +64,7 @@ public class LeDeviceListAdapter extends ArrayAdapter<BluetoothLeDevice> {
 			viewHolder = (ViewHolder) view.getTag();
 		}
 
-		final BluetoothLeDevice device = getItem(i);
+		final BluetoothLeDevice device = getCursor().getItem(i);
 		final String deviceName = device.getName();
 		final double rssi = device.getRssi();
 
@@ -88,9 +92,9 @@ public class LeDeviceListAdapter extends ArrayAdapter<BluetoothLeDevice> {
 			viewHolder.ibeaconSection.setVisibility(View.GONE);
 		}
 
-		final String rssiString = 
+		final String rssiString =
 				mActivity.getString(R.string.formatter_db, String.valueOf(rssi));
-		final String runningAverageRssiString = 
+		final String runningAverageRssiString =
 				mActivity.getString(R.string.formatter_db, String.valueOf(device.getRunningAverageRssi()));
 
 		viewHolder.deviceLastUpdated.setText(
diff --git a/sample_app/src/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java b/sample_app/src/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java
index aff765a..dabbf0a 100644
--- a/sample_app/src/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java
+++ b/sample_app/src/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java
@@ -16,6 +16,7 @@ import uk.co.alt236.bluetoothlelib.device.IBeaconDevice;
 import uk.co.alt236.bluetoothlelib.util.ByteUtils;
 import uk.co.alt236.bluetoothlelib.util.IBeaconUtils;
 import uk.co.alt236.btlescan.util.CsvWriterHelper;
+import uk.co.alt236.easycursor.objectcursor.EasyObjectCursor;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -60,6 +61,13 @@ public class BluetoothLeDeviceStore {
 		return writer;
 	}
 
+	public EasyObjectCursor<BluetoothLeDevice> getDeviceCursor(){
+		return new EasyObjectCursor<BluetoothLeDevice>(
+				BluetoothLeDevice.class,
+				getDeviceList(),
+				"address");
+	}
+
 	public List<BluetoothLeDevice> getDeviceList(){
 		final List<BluetoothLeDevice> methodResult = new ArrayList<BluetoothLeDevice>(mDeviceMap.values());