Index: trunk/grails-app/domain/Asset.groovy
===================================================================
--- trunk/grails-app/domain/Asset.groovy	(revision 121)
+++ trunk/grails-app/domain/Asset.groovy	(revision 122)
@@ -1,5 +1,7 @@
 class Asset {
+
     SystemSection systemSection
     AssetType assetType
+
     String name
     String description = ""
@@ -8,5 +10,5 @@
     static hasMany = [maintenanceActions: MaintenanceAction]
 
-    static belongsTo = [SystemSection]
+    static belongsTo = [SystemSection, AssetType]
 
 //     static constraints = {
Index: trunk/grails-app/domain/AssetExtendedAttribute.groovy
===================================================================
--- trunk/grails-app/domain/AssetExtendedAttribute.groovy	(revision 121)
+++ trunk/grails-app/domain/AssetExtendedAttribute.groovy	(revision 122)
@@ -2,7 +2,6 @@
 
     AssetType assetType
+    AssetExtendedAttributeType assetExtendedAttributeType
 
-    String name
-    String description = ""
     String value
     boolean isActive = true
@@ -17,5 +16,5 @@
 
     String toString() {
-        "${this.name}"
+        "${this.value}"
     }
 }
Index: trunk/grails-app/domain/AssetExtendedAttributeType.groovy
===================================================================
--- trunk/grails-app/domain/AssetExtendedAttributeType.groovy	(revision 122)
+++ trunk/grails-app/domain/AssetExtendedAttributeType.groovy	(revision 122)
@@ -0,0 +1,19 @@
+class AssetExtendedAttributeType {
+
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [assetExtendedAttributes: AssetExtendedAttribute]
+
+//     static belongsTo = []
+
+//     static constraints = {
+// 
+//     }
+
+    String toString() {
+        "${this.name}"
+    }
+}
+
Index: trunk/grails-app/domain/AssetType.groovy
===================================================================
--- trunk/grails-app/domain/AssetType.groovy	(revision 121)
+++ trunk/grails-app/domain/AssetType.groovy	(revision 122)
@@ -5,5 +5,8 @@
     boolean isActive = true
 
-    static hasMany = [assets: Asset, assemblies: Assembly, assetExtendedAttributes: AssetExtendedAttribute, maintenanceActions: MaintenanceAction]
+    static hasMany = [assets: Asset, 
+                                    assemblies: Assembly, 
+                                    assetExtendedAttributes: AssetExtendedAttribute, 
+                                    maintenanceActions: MaintenanceAction]
 
 //     static belongsTo = []
Index: trunk/grails-app/domain/ComponentItem.groovy
===================================================================
--- trunk/grails-app/domain/ComponentItem.groovy	(revision 121)
+++ trunk/grails-app/domain/ComponentItem.groovy	(revision 122)
@@ -1,3 +1,4 @@
 class ComponentItem {
+
     String name
     String description = ""
Index: trunk/grails-app/domain/Frequency.groovy
===================================================================
--- trunk/grails-app/domain/Frequency.groovy	(revision 121)
+++ 	(revision )
@@ -1,17 +1,0 @@
-class Frequency {
-    String frequency
-    boolean isActive = true
-
-    static hasMany = [lifePlans: LifePlan]
-// 
-//     static belongsTo = []
-// 
-//     static constraints = {
-// 
-//     }
-
-    String toString() {
-        "${this.frequency}"
-    }
-}
-
Index: trunk/grails-app/domain/MaintenanceAction.groovy
===================================================================
--- trunk/grails-app/domain/MaintenanceAction.groovy	(revision 121)
+++ trunk/grails-app/domain/MaintenanceAction.groovy	(revision 122)
@@ -2,5 +2,5 @@
     MaintenancePolicy maintenancePolicy
     PlannedMaintenance plannedMaintenance
-    SystemSection
+    SystemSection systemSection
     Asset asset
     AssetType assetType
@@ -16,7 +16,12 @@
     static belongsTo = [PlannedMaintenance]
 
-//     static constraints = {
-// 
-//     }
+    static constraints = {
+        systemSection(blank:true, nullable:true)
+        asset(blank:true, nullable:true)
+        assetType(blank:true, nullable:true)
+        assembly(blank:true, nullable:true)
+        subAssembly(blank:true, nullable:true)
+        componentItem(blank:true, nullable:true)
+    }
 
     String toString() {
Index: trunk/grails-app/domain/MaintenancePolicy.groovy
===================================================================
--- trunk/grails-app/domain/MaintenancePolicy.groovy	(revision 121)
+++ trunk/grails-app/domain/MaintenancePolicy.groovy	(revision 122)
@@ -12,7 +12,7 @@
 //     }
 
-//     String toString() {
-//         "${this.name}"
-//     }
+    String toString() {
+        "${this.name}"
+    }
 }
 
Index: trunk/grails-app/domain/Period.groovy
===================================================================
--- trunk/grails-app/domain/Period.groovy	(revision 122)
+++ trunk/grails-app/domain/Period.groovy	(revision 122)
@@ -0,0 +1,17 @@
+class Period {
+    String period
+    boolean isActive = true
+
+    static hasMany = [recurringSchedules: RecurringSchedule]
+// 
+//     static belongsTo = []
+// 
+//     static constraints = {
+// 
+//     }
+
+    String toString() {
+        "${this.period}"
+    }
+}
+
Index: trunk/grails-app/domain/RecurringSchedule.groovy
===================================================================
--- trunk/grails-app/domain/RecurringSchedule.groovy	(revision 121)
+++ trunk/grails-app/domain/RecurringSchedule.groovy	(revision 122)
@@ -1,7 +1,7 @@
 class RecurringSchedule {
 
+    Task task
+    Period period
     PlannedMaintenance plannedMaintenance
-    Period period
-    Task task
 
     Integer recurEvery
@@ -13,6 +13,7 @@
     static belongsTo = [Task]
 
-//     static constraints = {
-//     }
+    static constraints = {
+        plannedMaintenance(blank:true, nullable:true)
+    }
 
 //     String toString() {
Index: trunk/grails-app/domain/Task.groovy
===================================================================
--- trunk/grails-app/domain/Task.groovy	(revision 121)
+++ trunk/grails-app/domain/Task.groovy	(revision 122)
@@ -36,4 +36,5 @@
         comment()
         primaryAsset(blank: true, nullable:true)
+        recurringSchedule(blank: true, nullable:true)
         
     }