diff --git a/finder_commander/launchd/com.webmanager.remote-client-agent.plist b/finder_commander/launchd/com.webmanager.remote-client-agent.plist
new file mode 100644
index 0000000..a865964
--- /dev/null
+++ b/finder_commander/launchd/com.webmanager.remote-client-agent.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>com.webmanager.remote-client-agent</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>/usr/bin/python3</string>
+      <string>-u</string>
+      <string>/workspace/webmanager-mvp/finder_commander/remote_client_agent.py</string>
+      <string>--config</string>
+      <string>/workspace/webmanager-mvp/finder_commander/remote_client_agent.launchd.json</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <true/>
+    <key>StandardOutPath</key>
+    <string>/tmp/com.webmanager.remote-client-agent.out.log</string>
+    <key>StandardErrorPath</key>
+    <string>/tmp/com.webmanager.remote-client-agent.err.log</string>
+  </dict>
+</plist>
diff --git a/finder_commander/remote_client_agent.launchd.json b/finder_commander/remote_client_agent.launchd.json
new file mode 100644
index 0000000..e1d5879
--- /dev/null
+++ b/finder_commander/remote_client_agent.launchd.json
@@ -0,0 +1,15 @@
+{
+  "agent_access_token": "change-me-agent-token",
+  "client_id": "",
+  "display_name": "MacBook Pro van Jan",
+  "endpoint": "http://192.168.1.25:8765",
+  "heartbeat_interval_seconds": 20,
+  "platform": "macos",
+  "registration_token": "change-me-registration-token",
+  "shares": {
+    "downloads": "/Users/jan/Downloads",
+    "movies": "/Users/jan/Movies",
+    "pictures": "/Users/jan/Pictures"
+  },
+  "webmanager_base_url": "http://127.0.0.1:8080"
+}
diff --git a/webui/backend/data/tasks.db b/webui/backend/data/tasks.db
index 515638c..62299f7 100644
Binary files a/webui/backend/data/tasks.db and b/webui/backend/data/tasks.db differ