Index: trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- trunk/grails-app/services/CreateDataService.groovy	(revision 503)
+++ trunk/grails-app/services/CreateDataService.groovy	(revision 506)
@@ -46,12 +46,13 @@
 
         if(appConfigService.exists("baseDataCreated")) {
-            log.error "Base data has already been created, will NOT recreate."
+            log.info "Base data previously created."
             return false
         }
 
-        log.info "Creating base data..."
+        log.info "Creating base data."
 
         // Person and Utils
         createBaseAuthorities()
+        createBasePersonGroupTypes()
         createBasePersonGroups()
         createBaseDefinitions()
@@ -211,30 +212,34 @@
     }
 
+    void createBasePersonGroupTypes() {
+
+        //PersonGroupType.
+        def personGroupTypeInstance
+        personGroupTypeInstance = new PersonGroupType(name:"Team")
+        saveAndTest(personGroupTypeInstance)
+        personGroupTypeInstance = new PersonGroupType(name:"Contractor")
+        saveAndTest(personGroupTypeInstance)
+        personGroupTypeInstance = new PersonGroupType(name:"Project Team")
+        saveAndTest(personGroupTypeInstance)
+    }
+
     void createBasePersonGroups() {
-        //TypeOfPersonGroup
-        def personGroupTypeInstance
-            personGroupTypeInstance = new PersonGroupType(name:"Team")
-        saveAndTest(personGroupTypeInstance)
-            personGroupTypeInstance = new PersonGroupType(name:"Contractor")
-        saveAndTest(personGroupTypeInstance)
-            personGroupTypeInstance = new PersonGroupType(name:"ProjectTeam")
-        saveAndTest(personGroupTypeInstance)
 
         //PersonGroup
         def personGroupInstance
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
-                            name:"Electrical")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
+                                                                                name:"Electrical - General")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
-                            name:"Mechanical")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
+                                                                                name:"Mechanical - General")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
-                            name:"Production")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
+                                                                                name:"Production")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(2),
-                            name:"Kewl AirCon Guys")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(2),
+                                                                                name:"AirCon Contractor")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(3),
-                            name:"gnuMims")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(3),
+                                                                                name:"gnuMims")
         saveAndTest(personGroupInstance)
     }