diff --git a/js/app/controllers/taskscontroller.js b/js/app/controllers/taskscontroller.js
index 8985c8df..4f52f7ee 100644
--- a/js/app/controllers/taskscontroller.js
+++ b/js/app/controllers/taskscontroller.js
@@ -164,14 +164,14 @@
 			  return $location.path('/lists/' + listID + '/tasks/' + id);
 			}
 		  };
-		  this._$scope.toggleCompleted = function(taskID) {
-			if (_$tasksmodel.completed(taskID)) {
-			  return _tasksbusinesslayer.uncompleteTask(taskID);
-			} else {
-			  return _tasksbusinesslayer.completeTask(taskID);
-			}
-		  };
-		  
+			this._$scope.toggleCompleted = function(task) {
+				if (task.completed) {
+					_tasksbusinesslayer.setPercentComplete(task, 0);
+				} else {
+					_tasksbusinesslayer.setPercentComplete(task, 100);
+				}
+			};
+
 			this._$scope.toggleStarred = function(task) {
 				if (task.priority > 5) {
 					_tasksbusinesslayer.setPriority(task, 0);
diff --git a/js/app/services/businesslayer/tasksbusinesslayer.js b/js/app/services/businesslayer/tasksbusinesslayer.js
index a9009a22..2b2ceac8 100644
--- a/js/app/services/businesslayer/tasksbusinesslayer.js
+++ b/js/app/services/businesslayer/tasksbusinesslayer.js
@@ -65,28 +65,26 @@ angular.module('Tasks').factory('TasksBusinessLayer', [
 				});
 			};
 
-		TasksBusinessLayer.prototype.setPercentComplete = function(taskID, percentComplete) {
-		  var task;
-		  this._$tasksmodel.setPercentComplete(taskID, percentComplete);
-		  if (percentComplete < 100) {
-			this._$tasksmodel.uncomplete(taskID);
-			task = this._$tasksmodel.getById(taskID);
-			this.uncompleteParents(task.related);
-		  } else {
-			this._$tasksmodel.complete(taskID);
-			this.completeChildren(taskID);
-		  }
-		  return this._persistence.setPercentComplete(taskID, percentComplete);
-		};
-
-		TasksBusinessLayer.prototype.completeTask = function(taskID) {
-		  this.setPercentComplete(taskID, 100);
-		  return this.hideSubtasks(taskID);
-		};
-
-		TasksBusinessLayer.prototype.uncompleteTask = function(taskID) {
-		  return this.setPercentComplete(taskID, 0);
-		};
+			TasksBusinessLayer.prototype.setPercentComplete = function(task, percentComplete) {
+				var task;
+				task.complete = percentComplete;
+				if (percentComplete < 100) {
+					task.completed = null;
+					if (percentComplete == 0) {
+						task.status = 'NEEDS-ACTION';
+					} else {
+						task.status = 'IN-PROCESS';
+					}
+					// this.uncompleteParents(task.related);
+				} else {
+					task.completed = ICAL.Time.now();
+					task.status = 'COMPLETED';
+					// this.completeChildren(task);
+				}
+				console.log(task);
+				this._$vtodoservice.update(task).then(function(task) {
+				});
+			};
 
 		TasksBusinessLayer.prototype.completeChildren = function(taskID) {
 		  var childID, childrenID, _i, _len, _results;
diff --git a/js/app/services/models/tasksmodel.js b/js/app/services/models/tasksmodel.js
index 9ab24369..de267e66 100644
--- a/js/app/services/models/tasksmodel.js
+++ b/js/app/services/models/tasksmodel.js
@@ -375,58 +375,6 @@
 		  });
 		};
 
-		TasksModel.prototype.starred = function(taskID) {
-		  return this.getById(taskID).starred;
-		};
-
-		TasksModel.prototype.star = function(taskID) {
-		  return this.update({
-			id: taskID,
-			starred: true
-		  });
-		};
-
-		TasksModel.prototype.unstar = function(taskID) {
-		  return this.update({
-			id: taskID,
-			starred: false
-		  });
-		};
-
-		TasksModel.prototype.setPriority = function(taskID, priority) {
-		  return this.update({
-			id: taskID,
-			priority: priority
-		  });
-		};
-
-		TasksModel.prototype.completed = function(taskID) {
-		  return this.getById(taskID).completed;
-		};
-
-		TasksModel.prototype.complete = function(taskID) {
-		  return this.update({
-			id: taskID,
-			completed: true,
-			completed_date: moment().format("YYYYMMDDTHHmmss")
-		  });
-		};
-
-		TasksModel.prototype.uncomplete = function(taskID) {
-		  return this.update({
-			id: taskID,
-			completed: false,
-			completed_date: null
-		  });
-		};
-
-		TasksModel.prototype.setPercentComplete = function(taskID, complete) {
-		  return this.update({
-			id: taskID,
-			complete: complete
-		  });
-		};
-
 		TasksModel.prototype.setDueDate = function(taskID, date) {
 		  return this.update({
 			id: taskID,
diff --git a/js/app/services/models/vtodo.js b/js/app/services/models/vtodo.js
index 0194d6c4..2be5e63f 100644
--- a/js/app/services/models/vtodo.js
+++ b/js/app/services/models/vtodo.js
@@ -385,7 +385,39 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
 		},
 		get complete() {
 			var vtodos = this.components.getAllSubcomponents('vtodo');
-			return vtodos[0].getFirstPropertyValue('complete') || 0;
+			return vtodos[0].getFirstPropertyValue('percent-complete') || 0;
+		},
+		set complete(complete) {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			vtodos[0].updatePropertyWithValue('percent-complete', complete);
+			this.data = this.components.toString();
+		},
+		get completed() {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			var comp = vtodos[0].getFirstPropertyValue('completed');
+			if (comp) {
+				return comp.toJSDate();
+			} else {
+				return false;
+			}
+		},
+		set completed(completed) {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			if (completed) {
+				vtodos[0].updatePropertyWithValue('completed', completed);
+			} else {
+				vtodos[0].removeProperty('completed');
+			}
+			this.data = this.components.toString();
+		},
+		get status() {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			return vtodos[0].getFirstPropertyValue('status');
+		},
+		set status(status) {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			vtodos[0].updatePropertyWithValue('status', status);
+			this.data = this.components.toString();
 		},
 		get note() {
 			var vtodos = this.components.getAllSubcomponents('vtodo');
@@ -422,8 +454,7 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
 		vtodo.updatePropertyWithValue('uid', RandomStringService.generate());
 		vtodo.updatePropertyWithValue('summary', task.summary);
 		vtodo.updatePropertyWithValue('priority', task.priority);
-		vtodo.updatePropertyWithValue('complete', task.complete);
-		// vtodo.updatePropertyWithValue('completed', task.completed);
+		vtodo.updatePropertyWithValue('percent-complete', task.complete);
 		vtodo.updatePropertyWithValue('x-oc-hidesubtasks', 0);
 		if (task.related) {
 			vtodo.updatePropertyWithValue('related-to', task.related);
@@ -432,24 +463,6 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
 			vtodo.updatePropertyWithValue('note', task.note);
 		}
 
-// RELATED-TO:d2e8f180-7675-4ae4-90b2-ecb0187b148f
-// PERCENT-COMPLETE:100
-// STATUS:COMPLETED
-// COMPLETED:20160301T093848Z
-// X-OC-HIDESUBTASKS:1
-
-				  // calendar: null,
-				  // related: related,
-				  // summary: taskName,
-				  // starred: false,
-				  // priority: '0',
-				  // due: false,
-				  // start: false,
-				  // reminder: null,
-				  // completed: false,
-				  // complete: '0',
-				  // note: false
-
 		// objectConverter.patch(vevent, {}, {
 		// 	allDay: !start.hasTime() && !end.hasTime(),
 		// 	dtstart: {
diff --git a/js/public/app.js b/js/public/app.js
index 3e5de5f7..d3ed403c 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -949,14 +949,14 @@ angular.module('Tasks').controller('ListController', [
 			  return $location.path('/lists/' + listID + '/tasks/' + id);
 			}
 		  };
-		  this._$scope.toggleCompleted = function(taskID) {
-			if (_$tasksmodel.completed(taskID)) {
-			  return _tasksbusinesslayer.uncompleteTask(taskID);
-			} else {
-			  return _tasksbusinesslayer.completeTask(taskID);
-			}
-		  };
-		  
+			this._$scope.toggleCompleted = function(task) {
+				if (task.completed) {
+					_tasksbusinesslayer.setPercentComplete(task, 0);
+				} else {
+					_tasksbusinesslayer.setPercentComplete(task, 100);
+				}
+			};
+
 			this._$scope.toggleStarred = function(task) {
 				if (task.priority > 5) {
 					_tasksbusinesslayer.setPriority(task, 0);
@@ -1644,28 +1644,26 @@ angular.module('Tasks').factory('TasksBusinessLayer', [
 				});
 			};
 
-		TasksBusinessLayer.prototype.setPercentComplete = function(taskID, percentComplete) {
-		  var task;
-		  this._$tasksmodel.setPercentComplete(taskID, percentComplete);
-		  if (percentComplete < 100) {
-			this._$tasksmodel.uncomplete(taskID);
-			task = this._$tasksmodel.getById(taskID);
-			this.uncompleteParents(task.related);
-		  } else {
-			this._$tasksmodel.complete(taskID);
-			this.completeChildren(taskID);
-		  }
-		  return this._persistence.setPercentComplete(taskID, percentComplete);
-		};
-
-		TasksBusinessLayer.prototype.completeTask = function(taskID) {
-		  this.setPercentComplete(taskID, 100);
-		  return this.hideSubtasks(taskID);
-		};
-
-		TasksBusinessLayer.prototype.uncompleteTask = function(taskID) {
-		  return this.setPercentComplete(taskID, 0);
-		};
+			TasksBusinessLayer.prototype.setPercentComplete = function(task, percentComplete) {
+				var task;
+				task.complete = percentComplete;
+				if (percentComplete < 100) {
+					task.completed = null;
+					if (percentComplete == 0) {
+						task.status = 'NEEDS-ACTION';
+					} else {
+						task.status = 'IN-PROCESS';
+					}
+					// this.uncompleteParents(task.related);
+				} else {
+					task.completed = ICAL.Time.now();
+					task.status = 'COMPLETED';
+					// this.completeChildren(task);
+				}
+				console.log(task);
+				this._$vtodoservice.update(task).then(function(task) {
+				});
+			};
 
 		TasksBusinessLayer.prototype.completeChildren = function(taskID) {
 		  var childID, childrenID, _i, _len, _results;
@@ -3605,58 +3603,6 @@ angular.module('Tasks').factory('Calendar', ['$rootScope', '$filter', function($
 		  });
 		};
 
-		TasksModel.prototype.starred = function(taskID) {
-		  return this.getById(taskID).starred;
-		};
-
-		TasksModel.prototype.star = function(taskID) {
-		  return this.update({
-			id: taskID,
-			starred: true
-		  });
-		};
-
-		TasksModel.prototype.unstar = function(taskID) {
-		  return this.update({
-			id: taskID,
-			starred: false
-		  });
-		};
-
-		TasksModel.prototype.setPriority = function(taskID, priority) {
-		  return this.update({
-			id: taskID,
-			priority: priority
-		  });
-		};
-
-		TasksModel.prototype.completed = function(taskID) {
-		  return this.getById(taskID).completed;
-		};
-
-		TasksModel.prototype.complete = function(taskID) {
-		  return this.update({
-			id: taskID,
-			completed: true,
-			completed_date: moment().format("YYYYMMDDTHHmmss")
-		  });
-		};
-
-		TasksModel.prototype.uncomplete = function(taskID) {
-		  return this.update({
-			id: taskID,
-			completed: false,
-			completed_date: null
-		  });
-		};
-
-		TasksModel.prototype.setPercentComplete = function(taskID, complete) {
-		  return this.update({
-			id: taskID,
-			complete: complete
-		  });
-		};
-
 		TasksModel.prototype.setDueDate = function(taskID, date) {
 		  return this.update({
 			id: taskID,
@@ -4136,7 +4082,39 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
 		},
 		get complete() {
 			var vtodos = this.components.getAllSubcomponents('vtodo');
-			return vtodos[0].getFirstPropertyValue('complete') || 0;
+			return vtodos[0].getFirstPropertyValue('percent-complete') || 0;
+		},
+		set complete(complete) {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			vtodos[0].updatePropertyWithValue('percent-complete', complete);
+			this.data = this.components.toString();
+		},
+		get completed() {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			var comp = vtodos[0].getFirstPropertyValue('completed');
+			if (comp) {
+				return comp.toJSDate();
+			} else {
+				return false;
+			}
+		},
+		set completed(completed) {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			if (completed) {
+				vtodos[0].updatePropertyWithValue('completed', completed);
+			} else {
+				vtodos[0].removeProperty('completed');
+			}
+			this.data = this.components.toString();
+		},
+		get status() {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			return vtodos[0].getFirstPropertyValue('status');
+		},
+		set status(status) {
+			var vtodos = this.components.getAllSubcomponents('vtodo');
+			vtodos[0].updatePropertyWithValue('status', status);
+			this.data = this.components.toString();
 		},
 		get note() {
 			var vtodos = this.components.getAllSubcomponents('vtodo');
@@ -4173,8 +4151,7 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
 		vtodo.updatePropertyWithValue('uid', RandomStringService.generate());
 		vtodo.updatePropertyWithValue('summary', task.summary);
 		vtodo.updatePropertyWithValue('priority', task.priority);
-		vtodo.updatePropertyWithValue('complete', task.complete);
-		// vtodo.updatePropertyWithValue('completed', task.completed);
+		vtodo.updatePropertyWithValue('percent-complete', task.complete);
 		vtodo.updatePropertyWithValue('x-oc-hidesubtasks', 0);
 		if (task.related) {
 			vtodo.updatePropertyWithValue('related-to', task.related);
@@ -4183,24 +4160,6 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
 			vtodo.updatePropertyWithValue('note', task.note);
 		}
 
-// RELATED-TO:d2e8f180-7675-4ae4-90b2-ecb0187b148f
-// PERCENT-COMPLETE:100
-// STATUS:COMPLETED
-// COMPLETED:20160301T093848Z
-// X-OC-HIDESUBTASKS:1
-
-				  // calendar: null,
-				  // related: related,
-				  // summary: taskName,
-				  // starred: false,
-				  // priority: '0',
-				  // due: false,
-				  // start: false,
-				  // reminder: null,
-				  // completed: false,
-				  // complete: '0',
-				  // note: false
-
 		// objectConverter.patch(vevent, {}, {
 		// 	allDay: !start.hasTime() && !end.hasTime(),
 		// 	dtstart: {
diff --git a/templates/part.taskbody.php b/templates/part.taskbody.php
index 4ccf74d6..4aba9c2c 100644
--- a/templates/part.taskbody.php
+++ b/templates/part.taskbody.php
@@ -3,7 +3,7 @@
     taskID="{{ task.uri }}"
     ng-class="{active: route.taskID==task.uri, subtasks: hasSubtasks(task), subtaskshidden: task.hidesubtasks, attachment: task.note!=''}">
     <div class="percentdone" style="width:{{ task.complete }}%; background-color:{{ getTaskColor(task.calendarid) }};"></div>
-    <a class="task-checkbox handler" name="toggleCompleted" ng-click="toggleCompleted(task.uri)">
+    <a class="task-checkbox handler" name="toggleCompleted" ng-click="toggleCompleted(task)">
         <span class="icon task-checkbox" ng-class="{'task-checked': task.completed}"></span>
     </a>
     <a class="icon task-separator"></a>