q

diff --git a/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/controller/AcademicManagerRestController.java b/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/controller/AcademicManagerRestController.java
index 7d9eeeb..fec3038 100644
--- a/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/controller/AcademicManagerRestController.java
+++ b/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/controller/AcademicManagerRestController.java
@@ -258,4 +258,80 @@ public class AcademicManagerRestController {
 		}
 		return grades;
 	}
+	
+	/*---------------------------- COURSE ----------------------------*/
+    /**
+     * Wrap a Course object to its DTO version.
+     * @deprecated we have created a constructor in the CourseDto class.
+     * @throws IllegalArgumentException if course == null.
+     * @param course the Course object to be converted.
+     * @return a CourseDto object representing the Course object.
+     */
+    @SuppressWarnings("unused")
+	private static CourseDto course2Dto(Course course) throws IllegalArgumentException {
+    	if (course == null) throw new IllegalArgumentException("No course to convert!");
+    	return new CourseDto(course.getCourseID(), course.getTerm(), course.getCourseName(), course.getCourseRank());
+    }
+    
+    /**
+     * RESTful service: retrieves a specific Course by its ID.
+     * @author Bach Tran
+     * @throws IllegalArgumentException if courseID == null or courseID is an empty String.
+     * @return a CourseDto object having that ID specified.
+     * */
+    @GetMapping(value = {"/courses/specific", "/courses/specific/"})
+    @ResponseBody
+    public CourseDto getCourse(@RequestParam("id") String courseID, 
+    		@RequestParam("term") String term) {
+    	if (courseID == null || courseID.isEmpty()) throw new IllegalArgumentException();
+    	return new CourseDto(service.getCourse(courseID, term));
+    }
+    /**
+     * RESTful service: retrieves a list of all courses, sorted by their usefulness (courseRank).
+     * @author Bach Tran
+     * @return a sorted List<CourseDto> object by courseRank.
+     * */
+    @GetMapping(value = {"/courses", "/courses/"})
+    @ResponseBody
+    public List<CourseDto> getCourses() {
+    	// dummy...
+    	Set<Course> courseSet = service.getAllCourses();
+    	List<CourseDto> courseList = new ArrayList<CourseDto>();
+    	for (Course course : courseSet) {
+    		courseList.add(new CourseDto(course));
+    	}
+    	Collections.sort(courseList);
+    	return courseList;
+    }
+    /**
+     * RESTful service: retrieves n first useful course, using courseRank to make comparison.
+     * @param quantity number of courses wanted to retrieve.
+     * @return a list of n useful courses.
+     * */
+    @GetMapping(value = {"/courses/filter", "courses/filter/"})
+    @ResponseBody
+    public List<CourseDto> getCourses(@RequestParam("quantity")int quantity) {
+    	return new ArrayList<CourseDto>(getCourses().subList(0, (quantity < getCourses().size()) ? quantity : getCourses().size()));
+    }
+    
+    /**
+     * RESTful service: Creates a new course.
+     * @param id (primary key) a unique id of the Course
+     * @param term (primary key) the term that Course belong to.
+     * @param name the name of the Course
+     * @param rank the rank of the Course, this is a String will then be converted to an int.
+     * @author Bach Tran
+     * */
+    @PostMapping(value = { "/courses/create", "/events/create/" })
+    @ResponseBody
+    public CourseDto createCourse(@RequestParam("id") String id, 
+    		@RequestParam("term") String term, 
+    		@RequestParam("name") String name, 
+    		@RequestParam("rank") String rank) {
+    	
+    	Cooperator c = service.createCooperator(1);
+    	
+    	Course course = service.createCourse(id, term, name, Integer.parseInt(rank), c);
+    	return new CourseDto(course);
+    }
 }
\ No newline at end of file
diff --git a/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/service/AcademicManagerService.java b/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/service/AcademicManagerService.java
index fa57e10..bf87a2c 100644
--- a/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/service/AcademicManagerService.java
+++ b/Backend/src/main/java/ca/mcgill/ecse321/academicmanager/service/AcademicManagerService.java
@@ -139,8 +139,8 @@ public class AcademicManagerService {
 		course.setCourseName(courseName);
 		course.setCourseRank(rank);
 		
-//		course.setCooperator(c);
-		c.addCourse(course);
+		course.setCooperator(c);
+		//c.addCourse(course);
 		
 		return courseRepository.save(course);
 	}