diff --git a/assignment2/commit.go b/assignment2/commit.go
index 82e7b2226b6f74464452fcdc2eda65b156f21a7b..cd12f5e00d17f24630b76eb7067b0f3b350c2e07 100644
--- a/assignment2/commit.go
+++ b/assignment2/commit.go
@@ -119,14 +119,26 @@ func HandlerCommits(w http.ResponseWriter, r *http.Request) {
 	C.Repos = C.Repos[:TempInt] // sets how many repositories are gonna get displayed
 
 	http.Header.Add(w.Header(), "Content-Type", "application/json") // makes the print look good
+	json.NewEncoder(w).Encode(C)                                    // encode C
 
 	// Webhooks**********************
 
 	Payload := &WebhooksInvocation{}
-	Payload.Event = "Commits"
+	Payload.Event = "Commit"
 	Payload.Time = time.Now()
-	Payload.Params = "Limit = " + limit + "and Auth = " + auth
+	Payload.Params = "Limit = " + limit + " and Auth = " + auth
 
-	json.NewEncoder(w).Encode(C) // encode C
+	var webhooks []WebhookRegistration
+
+	webhooks, err = FBRead()
+	if err != nil {
+		fmt.Println("Error: ", err)
+	}
+
+	for i := range webhooks {
+		if webhooks[i].Event == Payload.Event {
+			CallUrl(webhooks[i].URL, Payload.Event+","+Payload.Params)
+		}
+	}
 
 }
diff --git a/assignment2/language.go b/assignment2/language.go
index a81b6dc49bdfe69f8459816fe79b06803c36feee..7f0c7ae3d7483236dc15018e13142f738771ee1c 100644
--- a/assignment2/language.go
+++ b/assignment2/language.go
@@ -136,12 +136,26 @@ func HandlerLanguages(w http.ResponseWriter, r *http.Request) {
 	L.Languages = L.Languages[:TempInt] // sets how many lauguages gets posted
 
 	http.Header.Add(w.Header(), "Content-Type", "application/json") // makes the print look good
+	json.NewEncoder(w).Encode(L)                                    // encode L
+
+	// Webhooks**********************
 
 	Payload := &WebhooksInvocation{}
 	Payload.Event = "Language"
 	Payload.Time = time.Now()
-	Payload.Params = "Limit = " + limit + "and Auth = " + auth
+	Payload.Params = "Limit = " + limit + " and Auth = " + auth
+
+	var webhooks []WebhookRegistration
 
-	json.NewEncoder(w).Encode(L) // encode L
+	webhooks, err = FBRead()
+	if err != nil {
+		fmt.Println("Error: ", err)
+	}
+
+	for i := range webhooks {
+		if webhooks[i].Event == Payload.Event {
+			CallUrl(webhooks[i].URL, Payload.Event+","+Payload.Params)
+		}
+	}
 
 }