diff --git a/lnbits/extensions/TwitchAlerts/views_api.py b/lnbits/extensions/TwitchAlerts/views_api.py
index f4656d456..75b654fc6 100644
--- a/lnbits/extensions/TwitchAlerts/views_api.py
+++ b/lnbits/extensions/TwitchAlerts/views_api.py
@@ -1,16 +1,46 @@
-# import json
-# import httpx
-# (use httpx just like requests, except instead of response.ok there's only the
-#  response.is_error that is its inverse)
-
-from quart import g, redirect, request  # jsonify
+from quart import g, redirect, request
 from http import HTTPStatus
 
 from lnbits.decorators import api_validate_post_request, api_check_wallet_key
 
 from . import TwitchAlerts_ext
-from .crud import get_charge_details
-from ..satspay.crud import create_charge, get_charge, delete_charge
+from .crud import (
+    get_charge_details,
+    create_donation,
+    post_donation,
+    create_service,
+    authenticate_service
+)
+from ..satspay.crud import create_charge, get_charge
+
+
+@TwitchAlerts_ext.route("/api/v1/createservice", methods=["POST"])
+@api_check_wallet_key("invoice")
+@api_validate_post_request(
+    schema={
+        "twitchuser": {"type": "string", "required": True},
+        "client_id": {"type": "string", "required": True},
+        "client_secret": {"type": "string", "required": True},
+        "wallet": {"type": "string", "required": True},
+        "servicename": {"type": "string", "required": True},
+        "onchain": {"type": "string"}
+    }
+)
+async def api_create_service():
+    """Create a service, which holds data about how/where to post donations"""
+    service = await create_service(**g.data)
+    redirect_url = request.scheme + "://" + request.headers["Host"]
+    redirect_url += f"/TwitchAlerts/?created={str(service.id)}"
+    return redirect(redirect_url)
+
+
+@TwitchAlerts_ext.route("/api/v1/authenticate/<service_id>", methods=["GET"])
+async def api_authenticate_service(service_id):
+    code = request.args.get('code')
+    redirect_uri = request.scheme + "://" + request.headers["Host"]
+    redirect_uri += f"/TwitchAlerts/api/v1/authenticate/{service_id}"
+    url = await authenticate_service(service_id, code, redirect_uri)
+    return redirect(url)
 
 
 @TwitchAlerts_ext.route("/api/v1/createdonation", methods=["POST"])
@@ -19,7 +49,7 @@ from ..satspay.crud import create_charge, get_charge, delete_charge
     schema={
         "name": {"type": "string"},
         "sats": {"type": "integer", "required": True},
-        "service": {"type": "string", "required": True},
+        "service": {"type": "integer", "required": True},
         "cur_code": {"type": "string", "required": True},
         "amount": {"type": "float", "required": True}
     }
@@ -28,9 +58,21 @@ async def api_create_donation():
     """Takes data from donation form and creates+returns SatsPay charge"""
     webhook_base = request.scheme + "://" + request.headers["Host"]
     charge_details = await get_charge_details(g.data["service"])
+    name = g.data.get("name", "Anonymous")
     charge = await create_charge(
+        amount=g.data["sats"],
+        completelink="https://twitch.tv/Fitti",
+        completelinktext="Back to Stream!",
         webhook=webhook_base + "/TwitchAlerts/api/v1/postdonation",
         **charge_details)
+    await create_donation(
+        id=charge.id,
+        name=name,
+        cur_code=g.data["cur_code"],
+        sats=g.data["sats"],
+        amount=g.data["amount"],
+        service=g.data["service"],
+    )
     return redirect(f"/satspay/{charge.id}")
 
 
@@ -54,12 +96,14 @@ async def api_post_donation():
 
     This endpoint acts as a webhook for the SatsPayServer extension."""
     data = await request.get_json(force=True)
-    charge_id = data["id"]
-    charge = await get_charge(charge_id)
+    donation_id = data.get("id", "No ID")
+    charge = await get_charge(donation_id)
     print(charge)
     if charge and charge.paid:
-        await delete_charge(charge_id)
         print("This endpoint works!")
-        return "", HTTPStatus.OK
+        if await post_donation(donation_id):
+            return "Posted!", HTTPStatus.OK
+        else:
+            return "Already posted!", HTTPStatus.OK
     else:
-        return "", HTTPStatus.OK
+        return "Not a paid charge!", HTTPStatus.OK