diff --git a/internal/articles.go b/internal/articles.go
index fba0d7b..b27f084 100644
--- a/internal/articles.go
+++ b/internal/articles.go
@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -16,45 +15,54 @@ type Article struct {
 
 var ARTICLES_LOCATION = Location{Database: "gohcms", Collection: "articles"}
 
-// TODO check if id_name is unique among all articles
-
-func AddArticle(c *gin.Context) {
-	var article Article
-	if c.BindJSON(&article) != nil {
-		SendErrorMessageToClient(c, "Could not correctly parse the article.")
-		return
-	}
-
-	document, err := bson.Marshal(article)
-	if err != nil {
-		SendErrorMessageToClient(c, "could not correctly marshal the article")
-		return
-	}
-
-	err = pushDocument(ARTICLES_LOCATION, document)
-	if err != nil {
-		SendErrorMessageToClient(c, "could not insert document into DB")
-		return
-	}
-
-	SendOkMessageToClient(c, "Article successfully added!")
-}
-
 // TODO Change to GetArticleList that will find filter json context
 func GetAllArticles(c *gin.Context) {
 	var articles []Article
 	documents, err := getDocuments(ARTICLES_LOCATION, bson.D{})
 	if err != nil {
-		SendErrorMessageToClient(c, err.Error())
-		return
+		SendErrorMessageToClient(c, err.Error()); return
 	}
 
 	for i := 0; i < len(documents); i++ {
 		var newArticle Article
 		bson.Unmarshal(documents[i], &newArticle)
-		fmt.Println(newArticle)
 		articles = append(articles, newArticle)
 	}
 
 	c.JSON(http.StatusOK, articles)
 }
+
+func IsArticleIdAlreadyUsed(id string) bool  {
+	documents, _ := getDocuments(ARTICLES_LOCATION, bson.D{})
+	for i := 0; i < len(documents); i++ {
+		var newArticle Article
+		bson.Unmarshal(documents[i], &newArticle)
+		if newArticle.Id_name == id {
+			return true
+		}
+	}
+	return false
+}
+
+func AddArticle(c *gin.Context) {
+	var article Article
+	if c.BindJSON(&article) != nil {
+		SendErrorMessageToClient(c, "Could not correctly parse the article."); return
+	}
+
+	document, err := bson.Marshal(article)
+	if err != nil {
+		SendErrorMessageToClient(c, "Could not correctly marshal the article."); return
+	}
+
+	if IsArticleIdAlreadyUsed(article.Id_name) {
+		SendErrorMessageToClient(c, "Article ID already used."); return
+	}
+
+	err = pushDocument(ARTICLES_LOCATION, document)
+	if err != nil {
+		SendErrorMessageToClient(c, "Could not insert document into DB."); return
+	}
+
+	SendOkMessageToClient(c, "Article successfully added!")
+}