diff --git a/api/orders/updateStatus.cfm b/api/orders/updateStatus.cfm
index 70d6a60..46a80f8 100644
--- a/api/orders/updateStatus.cfm
+++ b/api/orders/updateStatus.cfm
@@ -105,15 +105,24 @@
         <cfset orderTypeID = qOrderDetails.recordCount GT 0 ? val(qOrderDetails.OrderTypeID) : 1>
 
         <!--- OrderTypeID: 1=dine-in, 2=takeaway, 3=delivery --->
-        <!--- Only create food running tasks for dine-in orders for now --->
-        <!--- TODO: Takeaway will have optional pickup counter service point --->
-        <!--- TODO: Delivery will have GPS service point of delivery address --->
         <cfif orderTypeID EQ 1>
           <!--- Dine-in: Server delivers to service point --->
           <cfset tableName = len(qOrder.ServicePointName) ? qOrder.ServicePointName : "Table">
           <cfset taskTitle = "Deliver Order ###OrderID# to " & tableName>
           <cfset taskCategoryID = 3>
+        <cfelseif orderTypeID EQ 2>
+          <!--- Takeaway: Expo task to notify customer order is ready --->
+          <cfset taskTitle = "Order ###OrderID# Ready for Pickup - Notify Customer">
+          <cfset taskCategoryID = 4> <!--- Expo/Pickup category --->
+        <cfelseif orderTypeID EQ 3>
+          <!--- Delivery: Hand off to delivery driver --->
+          <cfset taskTitle = "Order ###OrderID# Ready for Delivery Driver">
+          <cfset taskCategoryID = 5> <!--- Delivery category --->
+        <cfelse>
+          <cfset taskTitle = "">
+        </cfif>
 
+        <cfif len(taskTitle)>
           <cfset queryExecute("
             INSERT INTO Tasks (
               TaskBusinessID,