diff --git a/app/controllers/admin/product_controller.rb b/app/controllers/admin/product_controller.rb
new file mode 100644
index 0000000..aa58865
--- /dev/null
+++ b/app/controllers/admin/product_controller.rb
@@ -0,0 +1,4 @@
+class Admin::ProductController < Admin::AbstractModelController
+  model_class Product  
+
+end
diff --git a/app/controllers/store_controller.rb b/app/controllers/store_controller.rb
deleted file mode 100644
index 05d1e69..0000000
--- a/app/controllers/store_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class StoreController < ApplicationController
-  scaffold :product
-end
diff --git a/app/views/admin/product/edit.rhtml b/app/views/admin/product/edit.rhtml
new file mode 100644
index 0000000..1454fca
--- /dev/null
+++ b/app/views/admin/product/edit.rhtml
@@ -0,0 +1,35 @@
+<% if @product.new_record? -%>
+<h1>New Product</h1>
+<% else -%>
+<h1>Edit Product</h1>
+<% end -%>
+
+<form method="post" action="">
+  <table class="fieldset">
+    <tbody>
+      <tr>
+        <td class="label"><label for="product_code">Code</label></td>
+        <td class="field"><%= text_field :product, :code, :size => 100, :class => 'textbox'  %></td>
+        <td class="help">Required. Only numbers an letters allowed</td>
+      </tr>
+      <tr>
+        <td class="label"><label class="optional" for="product_description">Description</label></td>
+        <td class="field"><%= text_area :product, :description, :size => '40x4' %></td>
+        <td class="help">Optional</td>
+      </tr>
+      <tr>
+        <td class="label"><label for="product_price">Price</label></td>
+        <td class="field"><%= text_field :product, :price %></td>
+        <td class="help">Required, has to be > 0.01</td>
+      </tr>
+    </tbody>
+  </table>  
+  <p class="buttons">
+    <%= save_model_button(@product) %>
+    <%= save_model_and_continue_editing_button(@product) %>
+    or <%= link_to "Cancel", product_index_url %>
+  </p>
+
+</form>
+
+<%= focus 'product_code' %>
\ No newline at end of file
diff --git a/app/views/admin/product/index.rhtml b/app/views/admin/product/index.rhtml
new file mode 100644
index 0000000..42ad724
--- /dev/null
+++ b/app/views/admin/product/index.rhtml
@@ -0,0 +1,39 @@
+<h1>Products</h1>
+<table id="products" class="index">
+  <thead>
+    <tr>
+      <th>Code</th>
+      <th>Description</th>
+      <th>Price</th>
+      <th>Modify</th>
+    </tr>
+  </thead>
+  <tbody>
+  <% unless @products.empty? -%>
+    <% for product in @products %>
+    <tr class="node">
+      <td class="code"><%= link_to h(product.code), product_edit_path(:id => product) %></td>
+      <td class="description"><%= link_to product.description, product_edit_path(:id => product) %></td>
+      <td><%=h product.price %></td>
+      <td class="remove">
+        <%= link_to image_tag("admin/remove.png", :alt => 'Remove Product'),
+                    product_remove_path(:id => product) %>
+      </td>
+    </tr>
+    <% end %>
+  <% else %>
+    <tr>
+      <td colspan="4" class="note">No Products</td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+<script type="text/javascript">
+// <![CDATA[
+  new RuledTable('products');
+// ]]>
+</script>
+
+<p>
+  <%= link_to 'New product', product_new_url %>
+</p>
\ No newline at end of file
diff --git a/app/views/admin/product/remove.rhtml b/app/views/admin/product/remove.rhtml
new file mode 100644
index 0000000..f080cc0
--- /dev/null
+++ b/app/views/admin/product/remove.rhtml
@@ -0,0 +1,20 @@
+<h1>Remove Product</h1>
+<p>Are you sure you want to <strong class="warning">permanently remove</strong>
+   the following product?</p>
+
+<table id="products" class="index">
+  <tbody>
+    <tr class="node level-1"
+     onmouseover="Element.addClassName(this, 'highlight');"
+     onmouseout="Element.removeClassName(this, 'highlight');">
+      <td class="code"><%= link_to h(@product.code), product_edit_path(:id => @product) %></td>
+      <td class="description"><%= link_to @product.description, product_edit_path(:id => @product) %></td>
+      <td><%=h @product.price %></td>
+    </tr>
+  </tbody>
+</table>
+
+<form method="post" action="">
+  <p class="buttons"><%= submit_tag "Delete Product", :class => 'button' %>
+    or <%= link_to 'Cancel', product_index_path %></p>
+</form>
diff --git a/shopping_trike_extension.rb b/shopping_trike_extension.rb
index 361e556..b683d47 100644
--- a/shopping_trike_extension.rb
+++ b/shopping_trike_extension.rb
@@ -7,7 +7,15 @@ class ShoppingTrikeExtension < Radiant::Extension
   url "http://code.trike.com.au/svn/radiant/extensions/shopping_trike/"
   
   define_routes do |map|
-    map.connect 'admin/store/:action', :controller => 'store'
+    # map.connect 'admin/store/:action', :controller => 'store'
+    # Product Routes
+    map.with_options(:controller => 'admin/product') do |product|
+      product.product_index  'admin/products',                     :action => 'index'
+      product.product_edit   'admin/products/edit/:id',            :action => 'edit'
+      product.product_new    'admin/products/new',                 :action => 'new'
+      product.product_remove 'admin/products/remove/:id',          :action => 'remove'
+    end
+
     map.connect 'shopping_trike/cart/:action', :controller => 'cart'
   end
   
@@ -17,7 +25,7 @@ def activate
       session :disabled => false
     end
     
-    admin.tabs.add "Products", "/admin/store", :after => "Layouts", :visibility => [:all]
+    admin.tabs.add "Products", "/admin/products", :after => "Layouts", :visibility => [:all]
   end
   
   def deactivate