diff --git a/src/main/java/com/ffii/tsms/modules/data/service/GradeService.kt b/src/main/java/com/ffii/tsms/modules/data/service/GradeService.kt
index 36b2df7..5a59953 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/GradeService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/GradeService.kt
@@ -24,7 +24,11 @@ open class GradeService(
         return jdbcDao.queryForList(sql.toString(), args)
     }
 
-    open fun allGrades(): List<GradeInfo> {
+    open fun allGradeInfo(): List<GradeInfo> {
         return gradeRepository.findGradeInfoByDeletedFalse()
     }
+
+    open fun allGrades(): List<Grade> {
+        return gradeRepository.findAll()
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/tsms/modules/data/web/GradeController.kt b/src/main/java/com/ffii/tsms/modules/data/web/GradeController.kt
index 35b4475..e4b424f 100644
--- a/src/main/java/com/ffii/tsms/modules/data/web/GradeController.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/web/GradeController.kt
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController
 class GradeController(private val gradeService: GradeService) {
     @GetMapping
     fun allGrades(): List<GradeInfo> {
-        return gradeService.allGrades();
+        return gradeService.allGradeInfo();
     }
 
     @GetMapping("/combo")
diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
index 6532e0e..ce619be 100644
--- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
@@ -4,6 +4,7 @@ import com.ffii.tsms.modules.data.entity.*
 import com.ffii.tsms.modules.data.service.CustomerContactService
 import com.ffii.tsms.modules.project.entity.projections.ProjectSearchInfo
 import com.ffii.tsms.modules.data.service.CustomerService
+import com.ffii.tsms.modules.data.service.GradeService
 import com.ffii.tsms.modules.project.entity.*
 import com.ffii.tsms.modules.project.entity.projections.InvoiceInfoSearchInfo
 import com.ffii.tsms.modules.project.entity.projections.InvoiceSearchInfo
@@ -20,6 +21,7 @@ open class ProjectsService(
         private val tasksService: TasksService,
         private val customerContactService: CustomerContactService,
         private val subsidiaryService: SubsidiaryService,
+        private val gradeService: GradeService,
         private val projectCategoryRepository: ProjectCategoryRepository,
         private val staffRepository: StaffRepository,
         private val staffAllocationRepository: StaffAllocationRepository,
@@ -71,6 +73,7 @@ open class ProjectsService(
 
         val allTasksMap = tasksService.allTasks().associateBy { it.id }
         val taskGroupMap = tasksService.allTaskGroups().associateBy { it.id }
+        val gradeMap = gradeService.allGrades().associateBy { it.id }
 
         val project =
                 Project().apply {
@@ -100,46 +103,47 @@ open class ProjectsService(
 
         // Milestones and tasks
         val tasksToSave = mutableListOf<ProjectTask>()
-        val milestones = request.milestones.entries.map { (taskStageId, requestMilestone) ->
+        val milestones = request.taskGroups.entries.map { (taskStageId, taskGroupAllocation) ->
             Milestone().apply {
                 val newMilestone = this
+                val requestMilestone = request.milestones[taskStageId]
                 this.project = project
                 this.taskGroup = taskGroupMap[taskStageId]
-                this.startDate = requestMilestone.startDate?.let { LocalDate.parse(it) }
-                this.endDate = requestMilestone.endDate?.let { LocalDate.parse(it) }
-                this.milestonePayments = requestMilestone.payments.map {
+                this.startDate = requestMilestone?.startDate?.let { LocalDate.parse(it) }
+                this.endDate = requestMilestone?.endDate?.let { LocalDate.parse(it) }
+                this.milestonePayments = requestMilestone?.payments?.map {
                     MilestonePayment().apply {
                         this.description = it.description
                         this.amount = it.amount
                         this.date = LocalDate.parse(it.date)
                         this.milestone = newMilestone
                     }
-                }.toMutableList()
+                }?.toMutableList() ?: mutableListOf()
 
                 // Tasks
-                val taskGroupAllocation = request.taskGroups[taskStageId]
-                this.stagePercentAllocation = taskGroupAllocation?.percentAllocation
+                this.stagePercentAllocation = taskGroupAllocation.percentAllocation
 
-                taskGroupAllocation?.taskIds?.map { taskId -> ProjectTask().apply {
+                taskGroupAllocation.taskIds.map { taskId -> ProjectTask().apply {
                     this.project = project
                     this.milestone = newMilestone
                     this.task = allTasksMap[taskId]
-                } }?.let { tasksToSave.addAll(it) }
+                } }.let { tasksToSave.addAll(it) }
             }
         }
 
-        // TODO: Get Grades from db
         // Grade allocation (from manhourPercentageByGrade)
-//        request.manhourPercentageByGrade.entries.map {
-//            GradeAllocation().apply {
-//                this.project = project
-//                this.manhour = it.value
-//            }
-//        }
+        val gradeAllocations = request.manhourPercentageByGrade.entries.map {
+            GradeAllocation().apply {
+                this.project = project
+                this.manhour = it.value
+                this.grade = gradeMap[it.key]
+            }
+        }
 
         val savedProject = projectRepository.save(project)
         milestoneRepository.saveAll(milestones)
         projectTaskRepository.saveAll(tasksToSave)
+        gradeAllocationRepository.saveAll(gradeAllocations)
 
         // Staff allocation
         val allocatedStaff = staffRepository.findAllById(request.allocatedStaffIds)