diff --git a/.gitignore b/.gitignore
index 671cf31..0923c2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ docs/_build/
 dist/
 venv/
 .venv
+tempCodeRunnerFile.py
diff --git a/README.md b/README.md
index e69de29..9d1f5c6 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,4 @@
+#Emojify Server
+This is a simple server that takes a string as input and returns the string with emojis. The server is written in Python and uses Flask as the web framework and I am running this on Hackclub's nest server.
+
+I have added a bunch of emojis manually but in the future I plan to use AI to predict the emojis based on the text.
\ No newline at end of file
diff --git a/app.py b/app.py
index 74b0a03..c665dfc 100644
--- a/app.py
+++ b/app.py
@@ -5,6 +5,12 @@ import random
 def emojify(message):
 
     choiceWordDict = {
+    "hello": "👋",
+    "hi": "👋",
+    "hey": "👋",
+    "greetings": "👋",
+    "goodbye": "👋",
+
     #happy face
     "happy": "😊",
     "joy": "😊",
@@ -175,8 +181,114 @@ def emojify(message):
     "fruit": "🍉",
     "refreshing": "🍉",
     "summer": "🍉",
-}
 
+
+
+    "eggplant": "🍆",
+    "aubergine": "🍆",
+    "banana": "🍌",
+    "peach": "🍑",
+    "cherries": "🍒",
+    "strawberry": "🍓",
+    "tomato": "🍅",
+    "avocado": "🥑",
+    "broccoli": "🥦",
+    "carrot": "🥕",
+    "corn": "🌽",
+    "cucumber": "🥒",
+    "lettuce": "🥬",
+    "mushroom": "🍄",
+    "pepper": "🌶️",
+    "hotpepper": "🌶️",
+    "potato": "🥔",
+    "sweetpotato": "🍠",
+    "croissant": "🥐",
+    "baguette": "🥖",
+    "pretzel": "🥨",
+    "cheese": "🧀",
+    "egg": "🥚",
+    "bacon": "🥓",
+    "pancakes": "🥞",
+    "poultryleg": "🍗",
+    "chicken": "🍗",
+    "meat": "🍖",
+    "bacon": "🥓",
+
+    "sad": "😢",
+    "angry": "😡",
+    "mad": "😡",
+    "fury": "😡",
+    "rage": "😡",
+    "disgust": "🤢",
+    "sick": "🤢",
+    "vomit": "🤢",
+    "gross": "🤢",
+    "nausea": "🤢",
+    "unhappy": "😞",
+    "depressed": "😞",
+    "miserable": "😞",
+    "gloomy": "😞",
+    "despair": "😞",
+    "spy": "🕵️",
+    "detective": "🕵️",
+    "sleuth": "🕵️",
+    "investigate": "🕵️",
+    "search": "🕵️",
+    "inspect": "🕵️",
+    "dance": "💃",
+    "dancer": "💃",
+    "ballerina": "💃",
+    "tango": "💃",
+    "dancing": "🕺",
+    "twin": "👯",
+    "sisters": "👯",
+    "twins": "👯",
+    "ballet": "🩰",
+    "pointeshoes": "🩰",
+    "balletshoes": "🩰",
+    "shoes": "👟",
+    "heels": "👠",
+    "finish": "🏁",
+    "sign": "🚩",
+    "leaf": "🍃",
+    "plant": "🌱",
+    "flower": "🌸",
+    "blossom": "🌸",
+    "rose": "🌹",
+    "tulip": "🌷",
+    "sunflower": "🌻",
+    "daisy": "🌼",
+    "hibiscus": "🌺",
+    "work": "🏢",
+    "office": "🏢",
+    "building": "🏢",
+    "construction": "🏗️",
+    "site": "🏗️",
+    "school": "🏫",
+    "university": "🏫",
+    "college": "🏫",
+    "hospital": "🏥",
+    "clinic": "🏥",
+    "doctor": "👩‍⚕️",
+    "nurse": "👩‍⚕️",
+    "therapist": "👩‍⚕️",
+    "healthcare": "👩‍⚕️",
+    "police": "👮",
+    "cop": "👮",
+    "law": "👮",
+    "enforcement": "👮",
+    "officer": "👮",
+    "movie": "🎥",
+    "film": "🎥",
+    "camera": "🎥",
+    "movies": "🎥",
+    "cinema": "🎥",
+    "theater": "🎭",
+    "drama": "🎭",
+    "acting": "🎭",
+    "perform": "🎭",
+}
+    puncList = [".",",","!","?",";", "'", '"', ":"]
     message = message.strip('"')
     message = message.strip("'")
     finalMessage = []
@@ -185,9 +297,12 @@ def emojify(message):
     for word in message:
         try:
             formWord = word.lower()
-            if formWord[-1] == ".":
-                finalMessage.append(word[:-1]  + (choiceWordDict[formWord[:-1]] * random.randint(1,3)) +".")
-            else:
+            done = False
+            for punctuation in puncList:
+                if formWord[-1] == punctuation:
+                    finalMessage.append(word[:-1]  + (choiceWordDict[formWord[:-1]] * random.randint(1,3)) +punctuation)
+                    done = True
+            if not done:
                 finalMessage.append(word  + choiceWordDict[word.lower()])
 
             
@@ -201,19 +316,21 @@ def emojify(message):
 
 
 
-
-
-
 app = Flask(__name__)
-CORS(app) 
+CORS(app)
+
+#if __name__ == "__main__":
+#    app.run(host='0.0.0.0', port=33303)
+
 
 @app.route('/getemoji', methods=['GET'])
+# @cross_origin()
 def get_random_emoji():
     # Get the 'letter' parameter from the URL
     message = request.args.get('message')
     print(message)
 
-    
+
     final = emojify(message)
     # print(final)
     final = jsonify({"message": final})# emoji in JSON format
@@ -222,4 +339,6 @@ def get_random_emoji():
     return final
 
 if __name__ == '__main__':
-    app.run(debug=True)
\ No newline at end of file
+    #app.run(debug=True)
+    # app.run(port=33303)
+    app.run(host='0.0.0.0', port=33303)
\ No newline at end of file
diff --git a/testGet.py b/testGet.py
index 53c168f..be21cf3 100644
--- a/testGet.py
+++ b/testGet.py
@@ -1,7 +1,7 @@
 import requests
 
-url = "http://127.0.0.1:5000/getemoji"
-
+url = "http://127.0.0.1:33303/getemoji"
+# url = "http://37.27.51.34:33303/getemoji"
 params = {
     "message": "I love chocolate donuts. I laugh at funny jokes about it. I think it is amazing."
 }