--- a/ckanext/datagovau/plugin.py
+++ b/ckanext/datagovau/plugin.py
@@ -6,6 +6,10 @@
 import ckan.plugins.toolkit as tk
 import ckan.model as model
 from pylons import config
+from routes.mapper import SubMapper, Mapper as _Mapper
+
+from sqlalchemy import orm
+import ckan.model
 
 #parse the activity feed for last active non-system user
 def get_last_active_user(id):
@@ -24,8 +28,12 @@
     created_datasets_list = user_dict['datasets']
     active_datasets_list = [x['data']['package'] for x in 
 				lib.helpers.get_action('user_activity_list',{'id':user_dict['id']}) if x['data'].get('package')]
-    return created_datasets_list + active_datasets_list
-
+    raw_list = created_datasets_list + active_datasets_list
+    filtered_dict = {}
+    for dataset in raw_list:
+	if dataset['id'] not in filtered_dict.keys():
+		filtered_dict[dataset['id']] = dataset
+    return filtered_dict.values()
 
 class DataGovAuPlugin(plugins.SingletonPlugin,
                                 tk.DefaultDatasetForm):
@@ -37,14 +45,55 @@
     plugins.implements(plugins.IConfigurer, inherit=False)
     plugins.implements(plugins.IDatasetForm, inherit=False)
     plugins.implements(plugins.ITemplateHelpers, inherit=False)
-    plugins.implements(plugins.IAuthFunctions)
-
-    def datastore_search(context, data_dict):
-        return {'success': True} # allow all
-
-    def get_auth_functions(self):
-        return {'datastore_search': datastore_search}
-
+    plugins.implements(plugins.IRoutes, inherit=True)
+
+    def before_map(self, map):
+
+	# Helpers to reduce code clutter
+	GET = dict(method=['GET'])
+	PUT = dict(method=['PUT'])
+	POST = dict(method=['POST'])
+	DELETE = dict(method=['DELETE'])
+	GET_POST = dict(method=['GET', 'POST'])
+	# intercept API calls that we want to capture analytics on
+	register_list = [
+        	'package',
+        	'dataset',
+        	'resource',
+	        'tag',
+	        'group',
+	        'related',
+	        'revision',
+	        'licenses',
+	        'rating',
+	        'user',
+	        'activity'
+	    ]
+	register_list_str = '|'.join(register_list)
+	# /api ver 3 or none
+	with SubMapper(map, controller='ckanext.datagovau.controller:DGAApiController', path_prefix='/api{ver:/3|}',
+	                ver='/3') as m:
+		m.connect('/action/{logic_function}', action='action',
+	                  conditions=GET_POST)
+
+	# /api ver 1, 2, 3 or none
+	with SubMapper(map, controller='ckanext.datagovau.controller:DGAApiController', path_prefix='/api{ver:/1|/2|/3|}',
+	                   ver='/1') as m:
+		m.connect('/search/{register}', action='search')
+	
+	# /api/rest ver 1, 2 or none
+	with SubMapper(map, controller='ckanext.datagovau.controller:DGAApiController', path_prefix='/api{ver:/1|/2|}',
+	                   ver='/1', requirements=dict(register=register_list_str)
+	                   ) as m:
+
+		m.connect('/rest/{register}', action='list', conditions=GET)
+		m.connect('/rest/{register}', action='create', conditions=POST)
+	        m.connect('/rest/{register}/{id}', action='show', conditions=GET)
+	        m.connect('/rest/{register}/{id}', action='update', conditions=PUT)
+	        m.connect('/rest/{register}/{id}', action='update', conditions=POST)
+	        m.connect('/rest/{register}/{id}', action='delete', conditions=DELETE)
+
+        return map
 
     def update_config(self, config):
         # Add this plugin's templates dir to CKAN's extra_template_paths, so
@@ -72,17 +121,17 @@
 
 
     def create_package_schema(self):
-        schema = super(ExampleIDatasetFormPlugin, self).create_package_schema()
+        schema = super(DataGovAuPlugin, self).create_package_schema()
         schema = self._modify_package_schema(schema)
         return schema
 
     def update_package_schema(self):
-        schema = super(ExampleIDatasetFormPlugin, self).update_package_schema()
+        schema = super(DataGovAuPlugin, self).update_package_schema()
         schema = self._modify_package_schema(schema)
         return schema
 
     def show_package_schema(self):
-        schema = super(ExampleIDatasetFormPlugin, self).show_package_schema()
+        schema = super(DataGovAuPlugin, self).show_package_schema()
 
         # Don't show vocab tags mixed in with normal 'free' tags
         # (e.g. on dataset pages, or on the search page)
@@ -145,25 +194,25 @@
     # called.
 
     def setup_template_variables(self, context, data_dict):
-        return super(ExampleIDatasetFormPlugin, self).setup_template_variables(
+        return super(DataGovAuPlugin, self).setup_template_variables(
             context, data_dict)
 
     def new_template(self):
-        return super(ExampleIDatasetFormPlugin, self).new_template()
+        return super(DataGovAuPlugin, self).new_template()
 
     def read_template(self):
-        return super(ExampleIDatasetFormPlugin, self).read_template()
+        return super(DataGovAuPlugin, self).read_template()
 
     def edit_template(self):
-        return super(ExampleIDatasetFormPlugin, self).edit_template()
+        return super(DataGovAuPlugin, self).edit_template()
 
     def search_template(self):
-        return super(ExampleIDatasetFormPlugin, self).search_template()
+        return super(DataGovAuPlugin, self).search_template()
 
     def history_template(self):
-        return super(ExampleIDatasetFormPlugin, self).history_template()
+        return super(DataGovAuPlugin, self).history_template()
 
     def package_form(self):
-        return super(ExampleIDatasetFormPlugin, self).package_form()
-
-
+        return super(DataGovAuPlugin, self).package_form()
+
+