diff --git a/lib/static/web/app/index.html b/lib/static/web/app/index.html
index 0fc9167819..5016805540 100644
--- a/lib/static/web/app/index.html
+++ b/lib/static/web/app/index.html
@@ -27,15 +27,18 @@
   <script src="js/controllers/Admins.js"></script>
   <script src="js/controllers/Inventories.js"></script>
   <script src="js/controllers/Hosts.js"></script>
+  <script src="js/controllers/Groups.js"></script>
   <script src="js/forms/Users.js"></script>
   <script src="js/forms/Organizations.js"></script>
   <script src="js/forms/Inventories.js"></script>
   <script src="js/forms/Hosts.js"></script>
+  <script src="js/forms/Groups.js"></script>
   <script src="js/lists/Users.js"></script>
   <script src="js/lists/Organizations.js"></script>
   <script src="js/lists/Admins.js"></script>
   <script src="js/lists/Inventories.js"></script>
   <script src="js/lists/Hosts.js"></script>
+  <script src="js/lists/Groups.js"></script>
   <script src="js/helpers/api-defaults.js"></script>
   <script src="js/helpers/refresh-related.js"></script>
   <script src="js/helpers/related-paginate.js"></script>
diff --git a/lib/static/web/app/js/app.js b/lib/static/web/app/js/app.js
index 745363d7cf..33803a25f2 100644
--- a/lib/static/web/app/js/app.js
+++ b/lib/static/web/app/js/app.js
@@ -30,7 +30,9 @@ angular.module('ansible', [
     'AWFilters',
     'HostFormDefinition',
     'HostListDefinition',
-    'HostHelper' 
+    'HostHelper',
+    'GroupFormDefinition',
+    'GroupListDefinition',
      ])
     .config(['$routeProvider', function($routeProvider) {
         $routeProvider.
@@ -49,8 +51,17 @@ angular.module('ansible', [
             when('/inventories/:id/hosts/add', { templateUrl: 'partials/inventories.html',
                                                  controller: HostsAdd }).
 
-             when('/inventories/:inventory_id/hosts/:id', { templateUrl: 'partials/inventories.html',
-                                                            controller: HostsEdit }).
+            when('/inventories/:inventory_id/hosts/:id', { templateUrl: 'partials/inventories.html',
+                                                           controller: HostsEdit }).
+
+            when('/inventories/:id/groups', { templateUrl: 'partials/inventories.html',
+                                              controller: GroupsList }).
+
+            when('/inventories/:id/groups/add', { templateUrl: 'partials/inventories.html',
+                                                  controller: GroupsAdd }).
+
+             when('/inventories/:inventory_id/groups/:id', { templateUrl: 'partials/inventories.html',
+                                                             controller: GroupsEdit }).
 
             when('/organizations', { templateUrl: 'partials/organizations.html',
                                      controller: OrganizationsList }).
diff --git a/lib/static/web/app/js/controllers/Groups.js b/lib/static/web/app/js/controllers/Groups.js
new file mode 100644
index 0000000000..5e2ea80af2
--- /dev/null
+++ b/lib/static/web/app/js/controllers/Groups.js
@@ -0,0 +1,230 @@
+/************************************
+ * Copyright (c) 2013 AnsibleWorks, Inc.
+ *
+ *
+ *  Groups.js
+ *  
+ *  Controller functions for Group model.
+ *
+ */
+
+'use strict';
+
+function GroupsList ($scope, $rootScope, $location, $log, $routeParams, Rest, 
+                     Alert, GroupList, GenerateList, LoadBreadCrumbs, Prompt, SearchInit, PaginateInit,
+                     ReturnToCaller, ClearScope)
+{
+    ClearScope('htmlTemplate');  //Garbage collection. Don't leave behind any listeners/watchers from the prior
+                                 //scope.
+
+    var list = GroupList;
+    var defaultUrl = '/api/v1/inventories/' + $routeParams.id + '/groups/';
+    var view = GenerateList;
+    var paths = $location.path().replace(/^\//,'').split('/');
+    var scope = view.inject(GroupList, { mode: 'edit' });               // Inject our view
+    scope.selected = [];
+  
+    SearchInit({ scope: scope, set: 'groups', list: list, url: defaultUrl });
+    PaginateInit({ scope: scope, list: list, url: defaultUrl });
+    scope.search(list.iterator);
+
+    LoadBreadCrumbs();
+
+    scope.addGroup = function() {
+       $location.path($location.path() + '/add');
+       }
+
+    scope.editGroup = function(id) {
+       $location.path($location.path() + '/' + id);
+       }
+ 
+    scope.deleteGroup = function(id, name) {
+       
+       var action = function() {
+           var url = defaultUrl;
+           Rest.setUrl(url);
+           Rest.post({ id: id, disassociate: 1 })
+               .success( function(data, status, headers, config) {
+                   $('#prompt-modal').modal('hide');
+                   scope.search(list.iterator);
+                   })
+               .error( function(data, status, headers, config) {
+                   $('#prompt-modal').modal('hide');
+                   ProcessErrors(scope, data, status, null,
+                            { hdr: 'Error!', msg: 'Call to ' + url + ' failed. DELETE returned status: ' + status });
+                   });      
+           };
+
+       Prompt({ hdr: 'Delete', 
+                body: 'Are you sure you want to delete group' + name + '?',
+                action: action
+                });
+       }
+
+}
+
+GroupsList.$inject = [ '$scope', '$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'GroupList', 'GenerateList', 
+                       'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'LookUpInventoryInit'];
+
+
+function GroupsAdd ($scope, $rootScope, $compile, $location, $log, $routeParams, GroupForm, 
+                   GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller,
+                   ClearScope, LookUpInventoryInit) 
+{
+   ClearScope('htmlTemplate');  //Garbage collection. Don't leave behind any listeners/watchers from the prior
+                                //scope.
+
+   // Inject dynamic view
+   var defaultUrl = '/api/v1/inventories/';
+   var form = GroupForm;
+   var generator = GenerateForm;
+   var scope = generator.inject(form, {mode: 'add', related: false});
+   generator.reset();
+   var master={};
+
+   LoadBreadCrumbs();
+
+   LookUpInventoryInit({ scope: scope });
+
+   // Load inventory lookup value
+   var url = defaultUrl + $routeParams.id + '/';
+   Rest.setUrl(url);
+   Rest.get()
+       .success( function(data, status, headers, config) {
+           scope['inventory'] = data.id;
+           master['inventory'] = data.id;
+           scope['inventory_name'] = data.name;
+           master['inventory_name'] = data.name;
+           })
+       .error( function(data, status, headers, config) {
+           ProcessErrors(scope, data, status, null,
+                         { hdr: 'Error!', msg: 'Failed to retrieve: ' + url + '. GET status: ' + status });
+           });
+
+   // Save
+   scope.formSave = function() {
+      Rest.setUrl(defaultUrl + $routeParams.id + '/groups/');
+      var data = {}
+      for (var fld in form.fields) {
+          data[fld] = scope[fld];   
+      } 
+      Rest.post(data)
+          .success( function(data, status, headers, config) {
+              ReturnToCaller(1);
+              })
+          .error( function(data, status, headers, config) {
+              ProcessErrors(scope, data, status, form,
+                            { hdr: 'Error!', msg: 'Failed to add new group. Post returned status: ' + status });
+              });
+      };
+
+   // Cancel
+   scope.formReset = function() {
+      // Defaults
+      generator.reset();
+      }; 
+
+}
+
+GroupsAdd.$inject = [ '$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'GroupForm', 'GenerateForm', 
+                      'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'LookUpInventoryInit' ]; 
+
+
+function GroupsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams, GroupForm, 
+                     GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, 
+                     RelatedPaginateInit, ReturnToCaller, ClearScope, LookUpInventoryInit) 
+{
+   ClearScope('htmlTemplate');  //Garbage collection. Don't leave behind any listeners/watchers from the prior
+                                //scope.
+
+   var defaultUrl='/api/v1/groups/';
+   var generator = GenerateForm;
+   var form = GroupForm;
+   var scope = generator.inject(form, {mode: 'edit', related: true});
+   generator.reset();
+   var master = {};
+   var id = $routeParams.id;
+   var relatedSets = {};
+
+   LookUpInventoryInit({ scope: scope });
+
+   // After the Organization is loaded, retrieve each related set
+   scope.$on('dataLoaded', function() {
+       
+       Rest.setUrl(scope['inventory_url']);
+       Rest.get()
+           .success( function(data, status, headers, config) {
+               scope['inventory_name'] = data.name;
+               master['inventory_name'] = data.name;
+               })
+           .error( function(data, status, headers, config) {
+               ProcessErrors(scope, data, status, null,
+                             { hdr: 'Error!', msg: 'Failed to retrieve: ' + scope.orgnization_url + '. GET status: ' + status });
+               });
+
+       for (var set in relatedSets) {
+           scope.search(relatedSets[set].iterator);
+       }
+
+       });
+
+   // Retrieve detail record and prepopulate the form
+   Rest.setUrl(defaultUrl + ':id/'); 
+   Rest.get({ params: {id: id} })
+       .success( function(data, status, headers, config) {
+           LoadBreadCrumbs();
+           for (var fld in form.fields) {
+              if (data[fld]) {
+                 scope[fld] = data[fld];
+                 master[fld] = scope[fld];
+              }
+           }
+           var related = data.related;
+           for (var set in form.related) {
+               if (related[set]) {
+                  relatedSets[set] = { url: related[set], iterator: form.related[set].iterator };
+               }
+           }
+           // Initialize related search functions. Doing it here to make sure relatedSets object is populated.
+           RelatedSearchInit({ scope: scope, form: form, relatedSets: relatedSets });
+           RelatedPaginateInit({ scope: scope, relatedSets: relatedSets });
+           scope['inventory_url'] = data.related.inventory;
+           scope.$emit('dataLoaded');
+           })
+       .error( function(data, status, headers, config) {
+           ProcessErrors(scope, data, status, form,
+                         { hdr: 'Error!', msg: 'Failed to retrieve group: ' + $routeParams.id + '. GET status: ' + status });
+           });
+   
+   // Save changes to the parent
+   scope.formSave = function() {
+      Rest.setUrl(defaultUrl + id + '/');
+      var data = {}
+      for (var fld in form.fields) {
+          data[fld] = scope[fld];   
+      } 
+      Rest.put(data)
+          .success( function(data, status, headers, config) {
+              var base = $location.path().replace(/^\//,'').split('/')[0];
+              (base == 'inventories') ? ReturnToCaller() : ReturnToCaller(1);
+              })
+          .error( function(data, status, headers, config) {
+              ProcessErrors(scope, data, status, form,
+                            { hdr: 'Error!', msg: 'Failed to update host: ' + $routeParams.id + '. PUT status: ' + status });
+              });
+      };
+
+   // Cancel
+   scope.formReset = function() {
+      generator.reset();
+      for (var fld in master) {
+          scope[fld] = master[fld];
+      }
+      };
+
+}
+
+HostsEdit.$inject = [ '$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'HostForm', 
+                      'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 
+                      'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', 'LookUpInventoryInit' ]; 
+  
\ No newline at end of file
diff --git a/lib/static/web/app/js/controllers/Hosts.js b/lib/static/web/app/js/controllers/Hosts.js
index 3559c9cb5e..fdefc49c9c 100644
--- a/lib/static/web/app/js/controllers/Hosts.js
+++ b/lib/static/web/app/js/controllers/Hosts.js
@@ -69,7 +69,8 @@ HostsList.$inject = [ '$scope', '$rootScope', '$location', '$log', '$routeParams
 
 
 function HostsAdd ($scope, $rootScope, $compile, $location, $log, $routeParams, HostForm, 
-                   GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope) 
+                   GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, 
+                   ClearScope, LookUpInventoryInit) 
 {
    ClearScope('htmlTemplate');  //Garbage collection. Don't leave behind any listeners/watchers from the prior
                                 //scope.
@@ -80,9 +81,27 @@ function HostsAdd ($scope, $rootScope, $compile, $location, $log, $routeParams,
    var generator = GenerateForm;
    var scope = generator.inject(form, {mode: 'add', related: false});
    generator.reset();
+   var master = {};
 
    LoadBreadCrumbs();
 
+   LookUpInventoryInit({ scope: scope });
+
+   // Load inventory lookup value
+   var url = defaultUrl + $routeParams.id + '/';
+   Rest.setUrl(url);
+   Rest.get()
+       .success( function(data, status, headers, config) {
+           scope['inventory'] = data.id;
+           master['inventory'] = data.id;
+           scope['inventory_name'] = data.name;
+           master['inventory_name'] = data.name;
+           })
+       .error( function(data, status, headers, config) {
+           ProcessErrors(scope, data, status, null,
+                         { hdr: 'Error!', msg: 'Failed to retrieve: ' + url + '. GET status: ' + status });
+           });
+  
    // Save
    scope.formSave = function() {
       Rest.setUrl(defaultUrl + $routeParams.id + '/hosts/');
@@ -109,7 +128,7 @@ function HostsAdd ($scope, $rootScope, $compile, $location, $log, $routeParams,
 }
 
 HostsAdd.$inject = [ '$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'HostForm', 'GenerateForm', 
-                     'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope' ]; 
+                     'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'LookUpInventoryInit' ]; 
 
 
 function HostsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams, UserForm, 
@@ -130,7 +149,7 @@ function HostsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
 
    LookUpInventoryInit({ scope: scope });
 
-   // After the Organization is loaded, retrieve each related set
+   // After form data loads, load related sets and lookups
    scope.$on('dataLoaded', function() {
        
        Rest.setUrl(scope['inventory_url']);
@@ -141,7 +160,7 @@ function HostsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
                })
            .error( function(data, status, headers, config) {
                ProcessErrors(scope, data, status, null,
-                             { hdr: 'Error!', msg: 'Failed to retrieve: ' + scope.orgnization_url + '. GET status: ' + status });
+                             { hdr: 'Error!', msg: 'Failed to retrieve: ' + scope.inventory_url + '. GET status: ' + status });
                });
 
        for (var set in relatedSets) {
diff --git a/lib/static/web/app/js/forms/Groups.js b/lib/static/web/app/js/forms/Groups.js
new file mode 100644
index 0000000000..71e9fb5acf
--- /dev/null
+++ b/lib/static/web/app/js/forms/Groups.js
@@ -0,0 +1,64 @@
+/*********************************************
+ *  Copyright (c) 2013 AnsibleWorks, Inc.
+ *
+ *  Groups.js
+ *  Form definition for Group model
+ *
+ *
+ */
+angular.module('GroupFormDefinition', [])
+    .value(
+    'GroupForm', {
+        
+        addTitle: 'Create Group',                            //Legend in add mode
+        editTitle: '{{ name }}',                             //Legend in edit mode
+        name: 'group',                                       //Form name attribute
+        well: true,                                          //Wrap the form with TB well          
+
+        fields: {
+            name: {
+                label: 'Name',
+                type: 'text',
+                addRequired: true,
+                editRequired: true
+                },
+            description: { 
+                label: 'Description',
+                type: 'text',
+                addRequired: true,
+                editRequired: true
+                },
+            inventory: {
+                label: 'Inventory',
+                type: 'lookup',
+                sourceModel: 'inventory',
+                sourceField: 'name',
+                addRequired: true,
+                editRequired: true,
+                ngClick: 'lookUpInventory()'
+                }
+            },
+
+        buttons: { //for now always generates <button> tags 
+            save: { 
+                label: 'Save', 
+                icon: 'icon-ok',
+                class: 'btn btn-success',
+                ngClick: 'formSave()',    //$scope.function to call on click, optional
+                ngDisabled: true          //Disable when $pristine or $invalid, optional
+                },
+            reset: { 
+                ngClick: 'formReset()',
+                label: 'Reset',
+                icon: 'icon-remove',
+                class: 'btn',
+                ngDisabled: true          //Disabled when $pristine
+                }
+            },
+
+        related: { //related colletions (and maybe items?)
+               
+            }
+
+    }); //UserForm
+
diff --git a/lib/static/web/app/js/forms/Inventories.js b/lib/static/web/app/js/forms/Inventories.js
index 96a803c03b..9d1b2f9e05 100644
--- a/lib/static/web/app/js/forms/Inventories.js
+++ b/lib/static/web/app/js/forms/Inventories.js
@@ -68,7 +68,8 @@ angular.module('InventoryFormDefinition', [])
                 actions: { 
                     add: {
                         ngClick: "add('hosts')",
-                        icon: 'icon-plus'
+                        icon: 'icon-plus',
+                        awToolTip: 'Create a new host'
                         },
                     },
                 
@@ -85,11 +86,50 @@ angular.module('InventoryFormDefinition', [])
                 fieldActions: {
                     edit: {
                         ngClick: "edit('hosts', \{\{ host.id \}\}, '\{\{ host.name \}\}')",
-                        icon: 'icon-edit'
+                        icon: 'icon-edit',
+                        awToolTip: 'Edit host'
                         },
                     delete: {
                         ngClick: "delete('hosts', \{\{ host.id \}\}, '\{\{ host.name \}\}', 'hosts')",
                         icon: 'icon-remove',
+                        class: 'btn-danger',
+                        awToolTip: 'Create a new host'
+                        }
+                    }
+                },
+
+             groups:  {
+                type: 'collection',
+                title: 'Groups',
+                iterator: 'group',
+                open: false,
+                
+                actions: { 
+                    add: {
+                        ngClick: "add('groups')",
+                        icon: 'icon-plus',
+                        awToolTip: 'Create a new group'
+                        },
+                    },
+                
+                fields: {
+                    name: {
+                        key: true,
+                        label: 'Name'
+                        },
+                    description: {
+                        label: 'Description'
+                        }
+                    },
+                
+                fieldActions: {
+                    edit: {
+                        ngClick: "edit('groups', \{\{ group.id \}\}, '\{\{ group.name \}\}')",
+                        icon: 'icon-edit'
+                        },
+                    delete: {
+                        ngClick: "delete('groups', \{\{ group.id \}\}, '\{\{ group.name \}\}', 'groups')",
+                        icon: 'icon-remove',
                         class: 'btn-danger'
                         }
                     }
diff --git a/lib/static/web/app/js/lists/Groups.js b/lib/static/web/app/js/lists/Groups.js
new file mode 100644
index 0000000000..31a2ddf0b0
--- /dev/null
+++ b/lib/static/web/app/js/lists/Groups.js
@@ -0,0 +1,52 @@
+/*********************************************
+ *  Copyright (c) 2013 AnsibleWorks, Inc.
+ *
+ *  Groups.js 
+ *  List view object for Group data model.
+ *
+ *
+ */
+angular.module('GroupListDefinition', [])
+    .value(
+    'GroupList', {
+        
+        name: 'groups',
+        iterator: 'group',
+        selectTitle: 'Add Group',
+        editTitle: 'Groups',
+        
+        fields: {
+            name: {
+                key: true,
+                label: 'Name'
+                },
+            description: {
+                label: 'Description'
+                }
+            },
+        
+        actions: {
+            add: {
+                icon: 'icon-plus',
+                mode: 'select',             // One of: edit, select, all
+                ngClick: 'addGroup()',
+                class: 'btn btn-mini btn-success',
+                awToolTip: 'Create a new group'
+                }
+            },
+
+        fieldActions: {
+            edit: {
+                ngClick: "editGroup(\{\{ group.id \}\})",
+                icon: 'icon-edit',
+                awToolTip: 'Edit group'
+                },
+
+            delete: {
+                ngClick: "deleteGroup(\{\{ group.id \}\},'\{\{ group.name \}\}')",
+                icon: 'icon-remove',
+                class: 'btn-danger',
+                awToolTip: 'Delete group'
+                }
+            }
+        });
\ No newline at end of file