diff --git a/lib/api/list_implementation.dart b/lib/api/list_implementation.dart
index c781208..bc1646e 100644
--- a/lib/api/list_implementation.dart
+++ b/lib/api/list_implementation.dart
@@ -25,15 +25,6 @@ class ListAPIService extends APIService implements ListService {
 
   @override
   Future<TaskList> get(int listId) {
-    /*
-    return client.get('/lists/$listId').then((listmap) {
-      return client.get('/lists/$listId/tasks').then((value) {
-        listmap["tasks"] = value;
-        return TaskList.fromJson(listmap);
-      });
-    }
-  );
-    */
     return client.get('/lists/$listId').then((response) {
       final map = response.body;
       if (map.containsKey('id')) {
diff --git a/lib/api/task_implementation.dart b/lib/api/task_implementation.dart
index 79b10d3..5cbe223 100644
--- a/lib/api/task_implementation.dart
+++ b/lib/api/task_implementation.dart
@@ -17,13 +17,16 @@ class TaskAPIService extends APIService implements TaskService {
   }
 
   @override
-  Future<Response> get(int listId) {
-    return client.get('/list/$listId/tasks');
+  Future<Task> get(int listId) {
+    return client
+        .get('/list/$listId/tasks')
+        .then((response) => Task.fromJson(response.body));
   }
 
   @override
   Future delete(int taskId) {
-    return client.delete('/tasks/$taskId');
+    return client
+        .delete('/tasks/$taskId');
   }
 
   @override
@@ -37,13 +40,14 @@ class TaskAPIService extends APIService implements TaskService {
   Future<List<Task>> getAll() {
     return client
         .get('/tasks/all')
-        .then((value) => value.body.map<Task>((taskJson) => Task.fromJson(taskJson)).toList());
+        .then((response) => convertList(response.body, (result) => Task.fromJson(result)));
   }
 
   @override
   Future<Response> getAllByList(int listId,
       [Map<String, List<String>> queryParameters]) {
-    return client.get('/lists/$listId/tasks', queryParameters).then(
+    return client
+        .get('/lists/$listId/tasks', queryParameters).then(
             (response) => new Response(
             convertList(response.body, (result) => Task.fromJson(result)),
             response.statusCode,
@@ -56,7 +60,7 @@ class TaskAPIService extends APIService implements TaskService {
     return client
         .get('/tasks/all?$optionString')
         .then((value) {
-          return  value.body.map<Task>((taskJson) => Task.fromJson(taskJson)).toList();
+          return  convertList(value.body, (result) => Task.fromJson(result));
     });
   }
 
diff --git a/lib/service/mocked_services.dart b/lib/service/mocked_services.dart
index 4cc7b4e..3b60955 100644
--- a/lib/service/mocked_services.dart
+++ b/lib/service/mocked_services.dart
@@ -176,7 +176,7 @@ class MockedTaskService implements TaskService {
 
   @override
   int get maxPages => 1;
-  Future<Response> get(int taskId) {
+  Future<Task> get(int taskId) {
     // TODO: implement get
     throw UnimplementedError();
   }
diff --git a/lib/service/services.dart b/lib/service/services.dart
index 9e72f0d..6ff55d4 100644
--- a/lib/service/services.dart
+++ b/lib/service/services.dart
@@ -92,7 +92,7 @@ abstract class ListService {
 }
 
 abstract class TaskService {
-  Future<Response> get(int taskId);
+  Future<Task> get(int taskId);
   Future<Task> update(Task task);
   Future delete(int taskId);
   Future<Task> add(int listId, Task task);