Index: branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy	(revision 65)
+++ branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy	(revision 66)
@@ -83,5 +83,5 @@
         personInstance.addToAuthorities(Authority.get(1))
         personInstance.addToAuthorities(Authority.get(2))
-	personInstance.addToPersonGroups(PersonGroup.findByName("gnuMims"))
+        personInstance.addToPersonGroups(PersonGroup.findByName("gnuMims"))
 
         personInstance = new Person(loginName:"user",
@@ -92,5 +92,5 @@
         BootStrapSaveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(2))
-	personInstance.addToPersonGroups(PersonGroup.findByName("Electrical"))
+        personInstance.addToPersonGroups(PersonGroup.findByName("Electrical"))
 
         personInstance = new Person(loginName:"craig",
@@ -101,5 +101,5 @@
         BootStrapSaveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(2))
-	personInstance.addToPersonGroups(PersonGroup.findByName("Electrical"))
+        personInstance.addToPersonGroups(PersonGroup.findByName("Electrical"))
 
         personInstance = new Person(loginName:"joe",
@@ -110,5 +110,5 @@
         BootStrapSaveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(2))
-	personInstance.addToPersonGroups(PersonGroup.findByName("Mechanical"))
+        personInstance.addToPersonGroups(PersonGroup.findByName("Mechanical"))
 
         personInstance = new Person(loginName:"mann",
@@ -119,50 +119,85 @@
         BootStrapSaveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(2))
-	personInstance.addToPersonGroups(PersonGroup.findByName("Production"))
-                
+        personInstance.addToPersonGroups(PersonGroup.findByName("Production"))
+
+        //TaskStatus
+        def taskStatusInstance
+    
+        taskStatusInstance = new TaskStatus(name:"Not Started")
+        BootStrapSaveAndTest(taskStatusInstance)
+
+        taskStatusInstance = new TaskStatus(name:"In Progress")
+        BootStrapSaveAndTest(taskStatusInstance)
+
+        taskStatusInstance = new TaskStatus(name:"Completed")
+        BootStrapSaveAndTest(taskStatusInstance)
+
         //TaskGroup
-//         new TaskGroup(name:"Engineering",
-//                       description:"Engineering task group").save()
-//         new TaskGroup(name:"Production",
-//                       description:"Production task group").save()
-//         new TaskGroup(name:"NewProject(s)",
-//                       description:" ").save()
-                      
-        
+        def taskGroupInstance
+
+        taskGroupInstance = new TaskGroup(name:"Engineering Activites",
+                      description:"Engineering daily activities")
+        BootStrapSaveAndTest(taskGroupInstance)
+
+        taskGroupInstance = new TaskGroup(name:"Production Activites",
+                      description:"Production daily activities")
+        BootStrapSaveAndTest(taskGroupInstance)
+
+        taskGroupInstance = new TaskGroup(name:"NewProject(s)",
+                      description:" ")
+        BootStrapSaveAndTest(taskGroupInstance)
+
         //Task
-//         new Task(taskGroup:TaskGroup.findByName("Engineering"),
-//                  leadPerson:Person.get(3),
-//                  name:"Check specific level sensor",
-//                  description:"Has been noted as problematic, try recallibrating",
-//                  scheduledDate: new Date(),
-//                  targetDate: new Date() ).save()
-//         new Task(taskGroup:TaskGroup.findByName("Production"),
-//                  leadPerson:Person.get(5),
-//                  name:"Production Report",
-//                  description:"Production report for specific production run or shift",
-//                  scheduledDate: new Date(),
-//                  targetDate: new Date() ).save()
-//         new Task(taskGroup:TaskGroup.findByName("NewProject(s)"),
-//                  leadPerson:Person.get(1),
-//                  name:"Make killer CMMS app",
-//                  description:"Use Grails and get a move on!",
-//                  scheduledDate: new Date(),
-//                  targetDate: new Date() ).save()
+        def taskInstance
+
+        taskInstance = new Task(taskGroup:TaskGroup.findByName("Engineering Activites"),
+                 taskStatus:TaskStatus.findByName("Not Started"),
+                 leadPerson:Person.get(3),
+                 description:"Check specific level sensor",
+                 comment:"Has been noted as problematic, try recallibrating")
+        BootStrapSaveAndTest(taskInstance)
+        taskInstance.addToAssignedPersons(Person.get(1))
+        taskInstance.addToAssignedPersons(Person.get(2))
+
+        taskInstance = new Task(taskGroup:TaskGroup.findByName("Production Activites"),
+                 taskStatus:TaskStatus.findByName("Not Started"),
+                 leadPerson:Person.get(5),
+                 description:"Production Report",
+                 comment:"Production report for specific production run or shift")
+        BootStrapSaveAndTest(taskInstance)
+
+        taskInstance = new Task(taskGroup:TaskGroup.findByName("NewProject(s)"),
+                 taskStatus:TaskStatus.findByName("Not Started"),
+                 leadPerson:Person.get(1),
+                 description:"Make killer CMMS app",
+                 comment:"Use Grails and get a move on!")
+        BootStrapSaveAndTest(taskInstance)
 
         //EntryType
-//         new EntryType(name:"Fault").save()
-//         new EntryType(name:"WorkDone").save()
-//         new EntryType(name:"Production Report").save()
+        def entryTypeInstance
+
+        entryTypeInstance = new EntryType(name:"Fault")
+        BootStrapSaveAndTest(entryTypeInstance)
+
+        entryTypeInstance = new EntryType(name:"WorkDone")
+        BootStrapSaveAndTest(entryTypeInstance)
+
+        entryTypeInstance = new EntryType(name:"Production Report")
+        BootStrapSaveAndTest(entryTypeInstance)
+
+        entryTypeInstance = new EntryType(name:"Work Request")
+        BootStrapSaveAndTest(entryTypeInstance)
 
         //ModificationType
-//         new ModificationType(name:"Created").save()
-//         new ModificationType(name:"Completed").save()
-//         new ModificationType(name:"Closed").save()
-//         new ModificationType(name:"Altered").save()
-//         new ModificationType(name:"TargetDateModified").save()
-//         new ModificationType(name:"ScheduledDateModified").save()
-//         new ModificationType(name:"DescriptionModified").save()
-//         new ModificationType(name:"AssignedToModified").save()
-//         new ModificationType(name:"NameModified").save()
+        def modificationTypeInstance
+        modificationTypeInstance = new ModificationType(name:"Created").save()
+        modificationTypeInstance = new ModificationType(name:"Completed").save()
+        modificationTypeInstance = new ModificationType(name:"Closed").save()
+        modificationTypeInstance = new ModificationType(name:"Altered").save()
+        modificationTypeInstance = new ModificationType(name:"TargetDateModified").save()
+        modificationTypeInstance = new ModificationType(name:"ScheduledDateModified").save()
+        modificationTypeInstance = new ModificationType(name:"DescriptionModified").save()
+        modificationTypeInstance = new ModificationType(name:"AssignedToModified").save()
+        modificationTypeInstance = new ModificationType(name:"NameModified").save()
         
         if(BootStrapDemoDataSuccessful) {
Index: branches/TaskRewrite/src/grails-app/controllers/EntryController.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/controllers/EntryController.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/controllers/EntryController.groovy	(revision 66)
@@ -0,0 +1,82 @@
+class EntryController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ entryInstanceList: Entry.list( params ) ]
+    }
+
+    def show = {
+        def entryInstance = Entry.get( params.id )
+
+        if(!entryInstance) {
+            flash.message = "Entry not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ entryInstance : entryInstance ] }
+    }
+
+    def delete = {
+        def entryInstance = Entry.get( params.id )
+        if(entryInstance) {
+            entryInstance.delete()
+            flash.message = "Entry ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "Entry not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def entryInstance = Entry.get( params.id )
+
+        if(!entryInstance) {
+            flash.message = "Entry not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ entryInstance : entryInstance ]
+        }
+    }
+
+    def update = {
+        def entryInstance = Entry.get( params.id )
+        if(entryInstance) {
+            entryInstance.properties = params
+            if(!entryInstance.hasErrors() && entryInstance.save()) {
+                flash.message = "Entry ${params.id} updated"
+                redirect(action:show,id:entryInstance.id)
+            }
+            else {
+                render(view:'edit',model:[entryInstance:entryInstance])
+            }
+        }
+        else {
+            flash.message = "Entry not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def entryInstance = new Entry()
+        entryInstance.properties = params
+        return ['entryInstance':entryInstance]
+    }
+
+    def save = {
+        def entryInstance = new Entry(params)
+        if(!entryInstance.hasErrors() && entryInstance.save()) {
+            flash.message = "Entry ${entryInstance.id} created"
+            redirect(action:show,id:entryInstance.id)
+        }
+        else {
+            render(view:'create',model:[entryInstance:entryInstance])
+        }
+    }
+}
Index: branches/TaskRewrite/src/grails-app/controllers/EntryTypeController.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/controllers/EntryTypeController.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/controllers/EntryTypeController.groovy	(revision 66)
@@ -0,0 +1,82 @@
+class EntryTypeController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ entryTypeInstanceList: EntryType.list( params ) ]
+    }
+
+    def show = {
+        def entryTypeInstance = EntryType.get( params.id )
+
+        if(!entryTypeInstance) {
+            flash.message = "EntryType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ entryTypeInstance : entryTypeInstance ] }
+    }
+
+    def delete = {
+        def entryTypeInstance = EntryType.get( params.id )
+        if(entryTypeInstance) {
+            entryTypeInstance.delete()
+            flash.message = "EntryType ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "EntryType not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def entryTypeInstance = EntryType.get( params.id )
+
+        if(!entryTypeInstance) {
+            flash.message = "EntryType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ entryTypeInstance : entryTypeInstance ]
+        }
+    }
+
+    def update = {
+        def entryTypeInstance = EntryType.get( params.id )
+        if(entryTypeInstance) {
+            entryTypeInstance.properties = params
+            if(!entryTypeInstance.hasErrors() && entryTypeInstance.save()) {
+                flash.message = "EntryType ${params.id} updated"
+                redirect(action:show,id:entryTypeInstance.id)
+            }
+            else {
+                render(view:'edit',model:[entryTypeInstance:entryTypeInstance])
+            }
+        }
+        else {
+            flash.message = "EntryType not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def entryTypeInstance = new EntryType()
+        entryTypeInstance.properties = params
+        return ['entryTypeInstance':entryTypeInstance]
+    }
+
+    def save = {
+        def entryTypeInstance = new EntryType(params)
+        if(!entryTypeInstance.hasErrors() && entryTypeInstance.save()) {
+            flash.message = "EntryType ${entryTypeInstance.id} created"
+            redirect(action:show,id:entryTypeInstance.id)
+        }
+        else {
+            render(view:'create',model:[entryTypeInstance:entryTypeInstance])
+        }
+    }
+}
Index: branches/TaskRewrite/src/grails-app/controllers/ModificationController.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/controllers/ModificationController.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/controllers/ModificationController.groovy	(revision 66)
@@ -0,0 +1,82 @@
+class ModificationController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ modificationInstanceList: Modification.list( params ) ]
+    }
+
+    def show = {
+        def modificationInstance = Modification.get( params.id )
+
+        if(!modificationInstance) {
+            flash.message = "Modification not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ modificationInstance : modificationInstance ] }
+    }
+
+    def delete = {
+        def modificationInstance = Modification.get( params.id )
+        if(modificationInstance) {
+            modificationInstance.delete()
+            flash.message = "Modification ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "Modification not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def modificationInstance = Modification.get( params.id )
+
+        if(!modificationInstance) {
+            flash.message = "Modification not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ modificationInstance : modificationInstance ]
+        }
+    }
+
+    def update = {
+        def modificationInstance = Modification.get( params.id )
+        if(modificationInstance) {
+            modificationInstance.properties = params
+            if(!modificationInstance.hasErrors() && modificationInstance.save()) {
+                flash.message = "Modification ${params.id} updated"
+                redirect(action:show,id:modificationInstance.id)
+            }
+            else {
+                render(view:'edit',model:[modificationInstance:modificationInstance])
+            }
+        }
+        else {
+            flash.message = "Modification not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def modificationInstance = new Modification()
+        modificationInstance.properties = params
+        return ['modificationInstance':modificationInstance]
+    }
+
+    def save = {
+        def modificationInstance = new Modification(params)
+        if(!modificationInstance.hasErrors() && modificationInstance.save()) {
+            flash.message = "Modification ${modificationInstance.id} created"
+            redirect(action:show,id:modificationInstance.id)
+        }
+        else {
+            render(view:'create',model:[modificationInstance:modificationInstance])
+        }
+    }
+}
Index: branches/TaskRewrite/src/grails-app/controllers/ModificationTypeController.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/controllers/ModificationTypeController.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/controllers/ModificationTypeController.groovy	(revision 66)
@@ -0,0 +1,82 @@
+class ModificationTypeController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ modificationTypeInstanceList: ModificationType.list( params ) ]
+    }
+
+    def show = {
+        def modificationTypeInstance = ModificationType.get( params.id )
+
+        if(!modificationTypeInstance) {
+            flash.message = "ModificationType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ modificationTypeInstance : modificationTypeInstance ] }
+    }
+
+    def delete = {
+        def modificationTypeInstance = ModificationType.get( params.id )
+        if(modificationTypeInstance) {
+            modificationTypeInstance.delete()
+            flash.message = "ModificationType ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "ModificationType not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def modificationTypeInstance = ModificationType.get( params.id )
+
+        if(!modificationTypeInstance) {
+            flash.message = "ModificationType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ modificationTypeInstance : modificationTypeInstance ]
+        }
+    }
+
+    def update = {
+        def modificationTypeInstance = ModificationType.get( params.id )
+        if(modificationTypeInstance) {
+            modificationTypeInstance.properties = params
+            if(!modificationTypeInstance.hasErrors() && modificationTypeInstance.save()) {
+                flash.message = "ModificationType ${params.id} updated"
+                redirect(action:show,id:modificationTypeInstance.id)
+            }
+            else {
+                render(view:'edit',model:[modificationTypeInstance:modificationTypeInstance])
+            }
+        }
+        else {
+            flash.message = "ModificationType not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def modificationTypeInstance = new ModificationType()
+        modificationTypeInstance.properties = params
+        return ['modificationTypeInstance':modificationTypeInstance]
+    }
+
+    def save = {
+        def modificationTypeInstance = new ModificationType(params)
+        if(!modificationTypeInstance.hasErrors() && modificationTypeInstance.save()) {
+            flash.message = "ModificationType ${modificationTypeInstance.id} created"
+            redirect(action:show,id:modificationTypeInstance.id)
+        }
+        else {
+            render(view:'create',model:[modificationTypeInstance:modificationTypeInstance])
+        }
+    }
+}
Index: branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy	(revision 66)
@@ -0,0 +1,82 @@
+class TaskController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ taskInstanceList: Task.list( params ) ]
+    }
+
+    def show = {
+        def taskInstance = Task.get( params.id )
+
+        if(!taskInstance) {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ taskInstance : taskInstance ] }
+    }
+
+    def delete = {
+        def taskInstance = Task.get( params.id )
+        if(taskInstance) {
+            taskInstance.delete()
+            flash.message = "Task ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def taskInstance = Task.get( params.id )
+
+        if(!taskInstance) {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ taskInstance : taskInstance ]
+        }
+    }
+
+    def update = {
+        def taskInstance = Task.get( params.id )
+        if(taskInstance) {
+            taskInstance.properties = params
+            if(!taskInstance.hasErrors() && taskInstance.save()) {
+                flash.message = "Task ${params.id} updated"
+                redirect(action:show,id:taskInstance.id)
+            }
+            else {
+                render(view:'edit',model:[taskInstance:taskInstance])
+            }
+        }
+        else {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def taskInstance = new Task()
+        taskInstance.properties = params
+        return ['taskInstance':taskInstance]
+    }
+
+    def save = {
+        def taskInstance = new Task(params)
+        if(!taskInstance.hasErrors() && taskInstance.save()) {
+            flash.message = "Task ${taskInstance.id} created"
+            redirect(action:show,id:taskInstance.id)
+        }
+        else {
+            render(view:'create',model:[taskInstance:taskInstance])
+        }
+    }
+}
Index: branches/TaskRewrite/src/grails-app/controllers/TaskGroupController.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/controllers/TaskGroupController.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/controllers/TaskGroupController.groovy	(revision 66)
@@ -0,0 +1,82 @@
+class TaskGroupController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ taskGroupInstanceList: TaskGroup.list( params ) ]
+    }
+
+    def show = {
+        def taskGroupInstance = TaskGroup.get( params.id )
+
+        if(!taskGroupInstance) {
+            flash.message = "TaskGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ taskGroupInstance : taskGroupInstance ] }
+    }
+
+    def delete = {
+        def taskGroupInstance = TaskGroup.get( params.id )
+        if(taskGroupInstance) {
+            taskGroupInstance.delete()
+            flash.message = "TaskGroup ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "TaskGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def taskGroupInstance = TaskGroup.get( params.id )
+
+        if(!taskGroupInstance) {
+            flash.message = "TaskGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ taskGroupInstance : taskGroupInstance ]
+        }
+    }
+
+    def update = {
+        def taskGroupInstance = TaskGroup.get( params.id )
+        if(taskGroupInstance) {
+            taskGroupInstance.properties = params
+            if(!taskGroupInstance.hasErrors() && taskGroupInstance.save()) {
+                flash.message = "TaskGroup ${params.id} updated"
+                redirect(action:show,id:taskGroupInstance.id)
+            }
+            else {
+                render(view:'edit',model:[taskGroupInstance:taskGroupInstance])
+            }
+        }
+        else {
+            flash.message = "TaskGroup not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def taskGroupInstance = new TaskGroup()
+        taskGroupInstance.properties = params
+        return ['taskGroupInstance':taskGroupInstance]
+    }
+
+    def save = {
+        def taskGroupInstance = new TaskGroup(params)
+        if(!taskGroupInstance.hasErrors() && taskGroupInstance.save()) {
+            flash.message = "TaskGroup ${taskGroupInstance.id} created"
+            redirect(action:show,id:taskGroupInstance.id)
+        }
+        else {
+            render(view:'create',model:[taskGroupInstance:taskGroupInstance])
+        }
+    }
+}
Index: branches/TaskRewrite/src/grails-app/controllers/TaskStatusController.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/controllers/TaskStatusController.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/controllers/TaskStatusController.groovy	(revision 66)
@@ -0,0 +1,82 @@
+class TaskStatusController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ taskStatusInstanceList: TaskStatus.list( params ) ]
+    }
+
+    def show = {
+        def taskStatusInstance = TaskStatus.get( params.id )
+
+        if(!taskStatusInstance) {
+            flash.message = "TaskStatus not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ taskStatusInstance : taskStatusInstance ] }
+    }
+
+    def delete = {
+        def taskStatusInstance = TaskStatus.get( params.id )
+        if(taskStatusInstance) {
+            taskStatusInstance.delete()
+            flash.message = "TaskStatus ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "TaskStatus not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def taskStatusInstance = TaskStatus.get( params.id )
+
+        if(!taskStatusInstance) {
+            flash.message = "TaskStatus not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ taskStatusInstance : taskStatusInstance ]
+        }
+    }
+
+    def update = {
+        def taskStatusInstance = TaskStatus.get( params.id )
+        if(taskStatusInstance) {
+            taskStatusInstance.properties = params
+            if(!taskStatusInstance.hasErrors() && taskStatusInstance.save()) {
+                flash.message = "TaskStatus ${params.id} updated"
+                redirect(action:show,id:taskStatusInstance.id)
+            }
+            else {
+                render(view:'edit',model:[taskStatusInstance:taskStatusInstance])
+            }
+        }
+        else {
+            flash.message = "TaskStatus not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def taskStatusInstance = new TaskStatus()
+        taskStatusInstance.properties = params
+        return ['taskStatusInstance':taskStatusInstance]
+    }
+
+    def save = {
+        def taskStatusInstance = new TaskStatus(params)
+        if(!taskStatusInstance.hasErrors() && taskStatusInstance.save()) {
+            flash.message = "TaskStatus ${taskStatusInstance.id} created"
+            redirect(action:show,id:taskStatusInstance.id)
+        }
+        else {
+            render(view:'create',model:[taskStatusInstance:taskStatusInstance])
+        }
+    }
+}
Index: branches/TaskRewrite/src/grails-app/domain/Entry.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/Entry.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/domain/Entry.groovy	(revision 66)
@@ -0,0 +1,26 @@
+class Entry {
+    Person enteredBy
+    Task task
+    EntryType entryType
+    String comment
+    Date dateDone = new Date()
+    Date dateEntered = new Date()
+    Integer durationHour = 0
+    Integer durationMinute = 0
+
+    static belongsTo = [EntryType, Task, Person]
+
+    static constraints = {
+        task()
+        comment(blank:false,maxSize:500)
+        dateDone()
+        durationHour(min:0)
+        durationMinute(min:0,max:59)
+        
+    }
+
+    String toString() {
+        "${this.comment} - ${this.enteredBy}, ${this.dateDone}"
+    }
+}
+
Index: branches/TaskRewrite/src/grails-app/domain/EntryType.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/EntryType.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/domain/EntryType.groovy	(revision 66)
@@ -0,0 +1,14 @@
+class EntryType {
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [entries: Entry]
+    
+    static contstraints = {
+    }
+
+    String toString() {
+        "${this.name}"
+    }
+}
Index: branches/TaskRewrite/src/grails-app/domain/Modification.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/Modification.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/domain/Modification.groovy	(revision 66)
@@ -0,0 +1,19 @@
+class Modification {
+    Person person
+    ModificationType modificationType
+    Task task
+    Date date = new Date()
+    String comment
+
+    static belongsTo = [Person, ModificationType, Task]
+
+    static constraints = {
+        person()
+        modificationType()
+        task()
+        date()
+        comment()
+    }
+
+    static optionals = ["comment"]
+}
Index: branches/TaskRewrite/src/grails-app/domain/ModificationType.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/ModificationType.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/domain/ModificationType.groovy	(revision 66)
@@ -0,0 +1,14 @@
+class ModificationType {
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [modifications : Modification]
+
+    static constraints = {
+    }
+
+    String toString() {
+        "${this.name}"
+    }
+}
Index: branches/TaskRewrite/src/grails-app/domain/Person.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/Person.groovy	(revision 65)
+++ branches/TaskRewrite/src/grails-app/domain/Person.groovy	(revision 66)
@@ -2,8 +2,8 @@
 	static transients = ['pass']
     static hasMany = [authorities: Authority,
-                        personGroups: PersonGroup]
-//                         modifications: Modification,
-//                         entries: Entry,
-//                         tasks: Task]
+                        personGroups: PersonGroup,
+                        modifications: Modification,
+                        entries: Entry,
+                        tasks: Task]
 
     static belongsTo = [Authority, PersonGroup]
Index: branches/TaskRewrite/src/grails-app/domain/Task.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/Task.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/domain/Task.groovy	(revision 66)
@@ -0,0 +1,26 @@
+class Task {
+    TaskGroup taskGroup
+    TaskStatus taskStatus
+    Person leadPerson
+    String description
+    String comment = ""
+    Date targetStartDate = new Date()
+    Date targetCompletionDate = new Date()
+    boolean isScheduled = false
+    boolean isApproved = false
+    boolean isActive = true
+
+    static hasMany = [entries: Entry, modifications: Modification, assignedPersons: Person]
+
+    static belongsTo = [TaskGroup, TaskStatus, Person]
+
+    static constraints = {
+        targetStartDate()
+        description(blank:false,maxSize:50)
+        leadPerson()
+        taskStatus()
+        comment(maxSize:255)
+    }
+
+    String toString() {"${this.description}"}
+}
Index: branches/TaskRewrite/src/grails-app/domain/TaskGroup.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/TaskGroup.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/domain/TaskGroup.groovy	(revision 66)
@@ -0,0 +1,14 @@
+class TaskGroup {
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [tasks : Task]
+
+    static constraints = {
+        name(maxSize:50,unique:true,blank:false)
+        description(maxSize:100)
+    }
+
+    String toString() {"${this.name}"}
+}
Index: branches/TaskRewrite/src/grails-app/domain/TaskStatus.groovy
===================================================================
--- branches/TaskRewrite/src/grails-app/domain/TaskStatus.groovy	(revision 66)
+++ branches/TaskRewrite/src/grails-app/domain/TaskStatus.groovy	(revision 66)
@@ -0,0 +1,14 @@
+class TaskStatus {
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [tasks : Task]
+
+    static constraints = {
+        name(maxSize:50,unique:true,blank:false)
+        description(maxSize:100)
+    }
+
+    String toString() {"${this.name}"}
+}
Index: branches/TaskRewrite/src/grails-app/views/entry/create.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entry/create.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entry/create.gsp	(revision 66)
@@ -0,0 +1,110 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create Entry</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Entry List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create Entry</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${entryInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${entryInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${entryInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:entryInstance, field:'comment')}</textarea>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="dateDone">Date Done:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateDone','errors')}">
+                                    <g:datePicker name="dateDone" value="${entryInstance?.dateDone}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationHour">Duration Hour:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'durationHour','errors')}">
+                                    <input type="text" id="durationHour" name="durationHour" value="${fieldValue(bean:entryInstance,field:'durationHour')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationMinute">Duration Minute:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}">
+                                    <input type="text" id="durationMinute" name="durationMinute" value="${fieldValue(bean:entryInstance,field:'durationMinute')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="dateEntered">Date Entered:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateEntered','errors')}">
+                                    <g:datePicker name="dateEntered" value="${entryInstance?.dateEntered}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="enteredBy">Entered By:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'enteredBy','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="enteredBy.id" value="${entryInstance?.enteredBy?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="entryType">Entry Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'entryType','errors')}">
+                                    <g:select optionKey="id" from="${EntryType.list()}" name="entryType.id" value="${entryInstance?.entryType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/entry/edit.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entry/edit.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entry/edit.gsp	(revision 66)
@@ -0,0 +1,113 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit Entry</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Entry List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Entry</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit Entry</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${entryInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${entryInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${entryInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${entryInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:entryInstance, field:'comment')}</textarea>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="dateDone">Date Done:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateDone','errors')}">
+                                    <g:datePicker name="dateDone" value="${entryInstance?.dateDone}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationHour">Duration Hour:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'durationHour','errors')}">
+                                    <input type="text" id="durationHour" name="durationHour" value="${fieldValue(bean:entryInstance,field:'durationHour')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationMinute">Duration Minute:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}">
+                                    <input type="text" id="durationMinute" name="durationMinute" value="${fieldValue(bean:entryInstance,field:'durationMinute')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="dateEntered">Date Entered:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateEntered','errors')}">
+                                    <g:datePicker name="dateEntered" value="${entryInstance?.dateEntered}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="enteredBy">Entered By:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'enteredBy','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="enteredBy.id" value="${entryInstance?.enteredBy?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="entryType">Entry Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'entryType','errors')}">
+                                    <g:select optionKey="id" from="${EntryType.list()}" name="entryType.id" value="${entryInstance?.entryType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/entry/list.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entry/list.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entry/list.gsp	(revision 66)
@@ -0,0 +1,64 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Entry List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New Entry</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Entry List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <th>Task</th>
+                   	    
+                   	        <g:sortableColumn property="comment" title="Comment" />
+                        
+                   	        <g:sortableColumn property="dateDone" title="Date Done" />
+                        
+                   	        <g:sortableColumn property="durationHour" title="Duration Hour" />
+                        
+                   	        <g:sortableColumn property="durationMinute" title="Duration Minute" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${entryInstanceList}" status="i" var="entryInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${entryInstance.id}">${fieldValue(bean:entryInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:entryInstance, field:'task')}</td>
+                        
+                            <td>${fieldValue(bean:entryInstance, field:'comment')}</td>
+                        
+                            <td>${fieldValue(bean:entryInstance, field:'dateDone')}</td>
+                        
+                            <td>${fieldValue(bean:entryInstance, field:'durationHour')}</td>
+                        
+                            <td>${fieldValue(bean:entryInstance, field:'durationMinute')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${Entry.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/entry/show.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entry/show.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entry/show.gsp	(revision 66)
@@ -0,0 +1,100 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show Entry</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Entry List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Entry</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show Entry</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="task" action="show" id="${entryInstance?.task?.id}">${entryInstance?.task?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Comment:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'comment')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Date Done:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'dateDone')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Duration Hour:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'durationHour')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Duration Minute:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'durationMinute')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Date Entered:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'dateEntered')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Entered By:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${entryInstance?.enteredBy?.id}">${entryInstance?.enteredBy?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Entry Type:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="entryType" action="show" id="${entryInstance?.entryType?.id}">${entryInstance?.entryType?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${entryInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/entryType/create.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entryType/create.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entryType/create.gsp	(revision 66)
@@ -0,0 +1,65 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create EntryType</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">EntryType List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create EntryType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${entryTypeInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${entryTypeInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:entryTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${entryTypeInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:entryTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/entryType/edit.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entryType/edit.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entryType/edit.gsp	(revision 66)
@@ -0,0 +1,84 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit EntryType</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">EntryType List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New EntryType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit EntryType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${entryTypeInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${entryTypeInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${entryTypeInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:entryTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="entries">Entries:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'entries','errors')}">
+                                    
+<ul>
+<g:each var="e" in="${entryTypeInstance?.entries?}">
+    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="entry" params="['entryType.id':entryTypeInstance?.id]" action="create">Add Entry</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${entryTypeInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:entryTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/entryType/list.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entryType/list.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entryType/list.gsp	(revision 66)
@@ -0,0 +1,56 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>EntryType List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New EntryType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>EntryType List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <g:sortableColumn property="description" title="Description" />
+                        
+                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                        
+                   	        <g:sortableColumn property="name" title="Name" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${entryTypeInstanceList}" status="i" var="entryTypeInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${entryTypeInstance.id}">${fieldValue(bean:entryTypeInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:entryTypeInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:entryTypeInstance, field:'isActive')}</td>
+                        
+                            <td>${fieldValue(bean:entryTypeInstance, field:'name')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${EntryType.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/entryType/show.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/entryType/show.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/entryType/show.gsp	(revision 66)
@@ -0,0 +1,78 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show EntryType</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">EntryType List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New EntryType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show EntryType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryTypeInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryTypeInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Entries:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="e" in="${entryTypeInstance.entries}">
+                                    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryTypeInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:entryTypeInstance, field:'name')}</td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${entryTypeInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modification/create.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modification/create.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modification/create.gsp	(revision 66)
@@ -0,0 +1,83 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create Modification</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Modification List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create Modification</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${modificationInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${modificationInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${modificationInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="modificationType">Modification Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'modificationType','errors')}">
+                                    <g:select optionKey="id" from="${ModificationType.list()}" name="modificationType.id" value="${modificationInstance?.modificationType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${modificationInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="date">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${modificationInstance?.date}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'comment','errors')}">
+                                    <input type="text" id="comment" name="comment" value="${fieldValue(bean:modificationInstance,field:'comment')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modification/edit.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modification/edit.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modification/edit.gsp	(revision 66)
@@ -0,0 +1,86 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit Modification</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Modification List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Modification</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit Modification</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${modificationInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${modificationInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${modificationInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${modificationInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="modificationType">Modification Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'modificationType','errors')}">
+                                    <g:select optionKey="id" from="${ModificationType.list()}" name="modificationType.id" value="${modificationInstance?.modificationType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${modificationInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="date">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${modificationInstance?.date}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'comment','errors')}">
+                                    <input type="text" id="comment" name="comment" value="${fieldValue(bean:modificationInstance,field:'comment')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modification/list.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modification/list.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modification/list.gsp	(revision 66)
@@ -0,0 +1,64 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Modification List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New Modification</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Modification List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <th>Person</th>
+                   	    
+                   	        <th>Modification Type</th>
+                   	    
+                   	        <th>Task</th>
+                   	    
+                   	        <g:sortableColumn property="date" title="Date" />
+                        
+                   	        <g:sortableColumn property="comment" title="Comment" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${modificationInstanceList}" status="i" var="modificationInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${modificationInstance.id}">${fieldValue(bean:modificationInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:modificationInstance, field:'person')}</td>
+                        
+                            <td>${fieldValue(bean:modificationInstance, field:'modificationType')}</td>
+                        
+                            <td>${fieldValue(bean:modificationInstance, field:'task')}</td>
+                        
+                            <td>${fieldValue(bean:modificationInstance, field:'date')}</td>
+                        
+                            <td>${fieldValue(bean:modificationInstance, field:'comment')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${Modification.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modification/show.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modification/show.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modification/show.gsp	(revision 66)
@@ -0,0 +1,79 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show Modification</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Modification List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Modification</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show Modification</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Person:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${modificationInstance?.person?.id}">${modificationInstance?.person?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Modification Type:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="modificationType" action="show" id="${modificationInstance?.modificationType?.id}">${modificationInstance?.modificationType?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="task" action="show" id="${modificationInstance?.task?.id}">${modificationInstance?.task?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Date:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationInstance, field:'date')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Comment:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationInstance, field:'comment')}</td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${modificationInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modificationType/create.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modificationType/create.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modificationType/create.gsp	(revision 66)
@@ -0,0 +1,65 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create ModificationType</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">ModificationType List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create ModificationType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${modificationTypeInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${modificationTypeInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:modificationTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${modificationTypeInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:modificationTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modificationType/edit.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modificationType/edit.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modificationType/edit.gsp	(revision 66)
@@ -0,0 +1,84 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit ModificationType</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">ModificationType List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New ModificationType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit ModificationType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${modificationTypeInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${modificationTypeInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${modificationTypeInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:modificationTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${modificationTypeInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="modifications">Modifications:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'modifications','errors')}">
+                                    
+<ul>
+<g:each var="m" in="${modificationTypeInstance?.modifications?}">
+    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="modification" params="['modificationType.id':modificationTypeInstance?.id]" action="create">Add Modification</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:modificationTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modificationType/list.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modificationType/list.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modificationType/list.gsp	(revision 66)
@@ -0,0 +1,56 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>ModificationType List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New ModificationType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>ModificationType List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <g:sortableColumn property="description" title="Description" />
+                        
+                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                        
+                   	        <g:sortableColumn property="name" title="Name" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${modificationTypeInstanceList}" status="i" var="modificationTypeInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${modificationTypeInstance.id}">${fieldValue(bean:modificationTypeInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:modificationTypeInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:modificationTypeInstance, field:'isActive')}</td>
+                        
+                            <td>${fieldValue(bean:modificationTypeInstance, field:'name')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${ModificationType.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/modificationType/show.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/modificationType/show.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/modificationType/show.gsp	(revision 66)
@@ -0,0 +1,78 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show ModificationType</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">ModificationType List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New ModificationType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show ModificationType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationTypeInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationTypeInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationTypeInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Modifications:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="m" in="${modificationTypeInstance.modifications}">
+                                    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationTypeInstance, field:'name')}</td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${modificationTypeInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/task/create.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/task/create.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/task/create.gsp	(revision 66)
@@ -0,0 +1,128 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create Task</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Task List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create Task</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetStartDate">Target Start Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
+                                    <g:datePicker name="targetStartDate" value="${taskInstance?.targetStartDate}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="leadPerson">Lead Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskStatus">Task Status:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskStatus','errors')}">
+                                    <g:select optionKey="id" from="${TaskStatus.list()}" name="taskStatus.id" value="${taskInstance?.taskStatus?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isApproved">Is Approved:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isApproved','errors')}">
+                                    <g:checkBox name="isApproved" value="${taskInstance?.isApproved}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isScheduled">Is Scheduled:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isScheduled','errors')}">
+                                    <g:checkBox name="isScheduled" value="${taskInstance?.isScheduled}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetCompletionDate">Target Completion Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetCompletionDate','errors')}">
+                                    <g:datePicker name="targetCompletionDate" value="${taskInstance?.targetCompletionDate}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskGroup">Task Group:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskGroup','errors')}">
+                                    <g:select optionKey="id" from="${TaskGroup.list()}" name="taskGroup.id" value="${taskInstance?.taskGroup?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/task/edit.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/task/edit.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/task/edit.gsp	(revision 66)
@@ -0,0 +1,179 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit Task</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Task List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Task</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit Task</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${taskInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetStartDate">Target Start Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
+                                    <g:datePicker name="targetStartDate" value="${taskInstance?.targetStartDate}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="leadPerson">Lead Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskStatus">Task Status:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskStatus','errors')}">
+                                    <g:select optionKey="id" from="${TaskStatus.list()}" name="taskStatus.id" value="${taskInstance?.taskStatus?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="assignedPersons">Assigned Persons:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'assignedPersons','errors')}">
+                                    
+<ul>
+<g:each var="a" in="${taskInstance?.assignedPersons?}">
+    <li><g:link controller="person" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="person" params="['task.id':taskInstance?.id]" action="create">Add Person</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="entries">Entries:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'entries','errors')}">
+                                    
+<ul>
+<g:each var="e" in="${taskInstance?.entries?}">
+    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="entry" params="['task.id':taskInstance?.id]" action="create">Add Entry</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isApproved">Is Approved:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isApproved','errors')}">
+                                    <g:checkBox name="isApproved" value="${taskInstance?.isApproved}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isScheduled">Is Scheduled:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isScheduled','errors')}">
+                                    <g:checkBox name="isScheduled" value="${taskInstance?.isScheduled}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="modifications">Modifications:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'modifications','errors')}">
+                                    
+<ul>
+<g:each var="m" in="${taskInstance?.modifications?}">
+    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="modification" params="['task.id':taskInstance?.id]" action="create">Add Modification</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetCompletionDate">Target Completion Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetCompletionDate','errors')}">
+                                    <g:datePicker name="targetCompletionDate" value="${taskInstance?.targetCompletionDate}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskGroup">Task Group:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskGroup','errors')}">
+                                    <g:select optionKey="id" from="${TaskGroup.list()}" name="taskGroup.id" value="${taskInstance?.taskGroup?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/task/list.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/task/list.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/task/list.gsp	(revision 66)
@@ -0,0 +1,64 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Task List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New Task</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Task List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <g:sortableColumn property="targetStartDate" title="Target Start Date" />
+                        
+                   	        <g:sortableColumn property="description" title="Description" />
+                        
+                   	        <th>Lead Person</th>
+                   	    
+                   	        <th>Task Status</th>
+                   	    
+                   	        <g:sortableColumn property="comment" title="Comment" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskInstanceList}" status="i" var="taskInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${taskInstance.id}">${fieldValue(bean:taskInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'targetStartDate')}</td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'leadPerson')}</td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'taskStatus')}</td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'comment')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${Task.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/task/show.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/task/show.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/task/show.gsp	(revision 66)
@@ -0,0 +1,147 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show Task</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Task List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Task</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show Task</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Target Start Date:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'targetStartDate')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Lead Person:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${taskInstance?.leadPerson?.id}">${taskInstance?.leadPerson?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Status:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskStatus" action="show" id="${taskInstance?.taskStatus?.id}">${taskInstance?.taskStatus?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Comment:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'comment')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Assigned Persons:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'assignedPersons')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Entries:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="e" in="${taskInstance.entries}">
+                                    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Approved:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isApproved')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Scheduled:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isScheduled')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Modifications:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="m" in="${taskInstance.modifications}">
+                                    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Target Completion Date:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'targetCompletionDate')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Group:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskGroup" action="show" id="${taskInstance?.taskGroup?.id}">${taskInstance?.taskGroup?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskGroup/create.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskGroup/create.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskGroup/create.gsp	(revision 66)
@@ -0,0 +1,65 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create TaskGroup</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskGroup List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create TaskGroup</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskGroupInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskGroupInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskGroupInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:taskGroupInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskGroupInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskGroupInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskGroupInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskGroupInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskGroup/edit.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskGroup/edit.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskGroup/edit.gsp	(revision 66)
@@ -0,0 +1,84 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit TaskGroup</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskGroup List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskGroup</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit TaskGroup</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskGroupInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskGroupInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${taskGroupInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskGroupInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:taskGroupInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskGroupInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskGroupInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskGroupInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskGroupInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="tasks">Tasks:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskGroupInstance,field:'tasks','errors')}">
+                                    
+<ul>
+<g:each var="t" in="${taskGroupInstance?.tasks?}">
+    <li><g:link controller="task" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="task" params="['taskGroup.id':taskGroupInstance?.id]" action="create">Add Task</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskGroup/list.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskGroup/list.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskGroup/list.gsp	(revision 66)
@@ -0,0 +1,56 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>TaskGroup List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskGroup</g:link></span>
+        </div>
+        <div class="body">
+            <h1>TaskGroup List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <g:sortableColumn property="name" title="Name" />
+                        
+                   	        <g:sortableColumn property="description" title="Description" />
+                        
+                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskGroupInstanceList}" status="i" var="taskGroupInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${taskGroupInstance.id}">${fieldValue(bean:taskGroupInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:taskGroupInstance, field:'name')}</td>
+                        
+                            <td>${fieldValue(bean:taskGroupInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:taskGroupInstance, field:'isActive')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${TaskGroup.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskGroup/show.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskGroup/show.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskGroup/show.gsp	(revision 66)
@@ -0,0 +1,78 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show TaskGroup</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskGroup List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskGroup</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show TaskGroup</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskGroupInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskGroupInstance, field:'name')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskGroupInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskGroupInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Tasks:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="t" in="${taskGroupInstance.tasks}">
+                                    <li><g:link controller="task" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskGroupInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskStatus/create.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskStatus/create.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskStatus/create.gsp	(revision 66)
@@ -0,0 +1,65 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create TaskStatus</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskStatus List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create TaskStatus</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskStatusInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskStatusInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskStatusInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:taskStatusInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskStatusInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskStatusInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskStatusInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskStatusInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskStatus/edit.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskStatus/edit.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskStatus/edit.gsp	(revision 66)
@@ -0,0 +1,84 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit TaskStatus</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskStatus List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskStatus</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit TaskStatus</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskStatusInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskStatusInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${taskStatusInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskStatusInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:taskStatusInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskStatusInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskStatusInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskStatusInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskStatusInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="tasks">Tasks:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskStatusInstance,field:'tasks','errors')}">
+                                    
+<ul>
+<g:each var="t" in="${taskStatusInstance?.tasks?}">
+    <li><g:link controller="task" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="task" params="['taskStatus.id':taskStatusInstance?.id]" action="create">Add Task</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskStatus/list.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskStatus/list.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskStatus/list.gsp	(revision 66)
@@ -0,0 +1,56 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>TaskStatus List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskStatus</g:link></span>
+        </div>
+        <div class="body">
+            <h1>TaskStatus List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <g:sortableColumn property="name" title="Name" />
+                        
+                   	        <g:sortableColumn property="description" title="Description" />
+                        
+                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskStatusInstanceList}" status="i" var="taskStatusInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${taskStatusInstance.id}">${fieldValue(bean:taskStatusInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:taskStatusInstance, field:'name')}</td>
+                        
+                            <td>${fieldValue(bean:taskStatusInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:taskStatusInstance, field:'isActive')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${TaskStatus.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: branches/TaskRewrite/src/grails-app/views/taskStatus/show.gsp
===================================================================
--- branches/TaskRewrite/src/grails-app/views/taskStatus/show.gsp	(revision 66)
+++ branches/TaskRewrite/src/grails-app/views/taskStatus/show.gsp	(revision 66)
@@ -0,0 +1,78 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show TaskStatus</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskStatus List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskStatus</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show TaskStatus</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskStatusInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskStatusInstance, field:'name')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskStatusInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskStatusInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Tasks:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="t" in="${taskStatusInstance.tasks}">
+                                    <li><g:link controller="task" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskStatusInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>