diff --git a/Projects/1-Beginner/Calculator-App.md b/Projects/1-Beginner/Calculator-App/Calculator-App.md
similarity index 100%
rename from Projects/1-Beginner/Calculator-App.md
rename to Projects/1-Beginner/Calculator-App/Calculator-App.md
diff --git a/Projects/1-Beginner/Calculator-App/Calculator-App.py b/Projects/1-Beginner/Calculator-App/Calculator-App.py
new file mode 100644
index 00000000..5aad406f
--- /dev/null
+++ b/Projects/1-Beginner/Calculator-App/Calculator-App.py
@@ -0,0 +1,54 @@
+import ttkbootstrap as ttk
+import tkinter as tk
+
+class Main(ttk.Window):
+    def __init__(self, title, dimensions):
+        super().__init__(self)
+        self.title(title)
+        self.geometry(dimensions)
+
+    def __str__(self):
+        return super().__str__()
+
+class Calculator():
+    def __init__(self, title, dimensions):
+        self.main = Main(title, dimensions)
+        # The calculator count with 20 buttons 1 big label at the top
+        # The best way to place the buttons is ussing grid
+        # It also require a main frame 
+        # The frame is also the master for the buttons and the label
+        self.mainFrame = ttk.Frame(self.main, height=400, width=300)
+        self.mainFrame.pack(padx=5, pady=5, fill="both", expand=True)
+        self.buttonsSimbols=["A/C", "+/-", "/", "<-", "7","8","9","x", "4","5","6","-", "1","2","3","+", "0", ".", "="]
+        self.Configure()
+        self.screenFrame = ttk.Frame(self.mainFrame)
+        self.screenFrame.pack(padx=0, pady=0, expand=True)
+        self.buttonsFrame = ttk.Frame(self.mainFrame)
+        self.buttonsFrame.pack(padx=0, pady=0, expand=True)
+        self.screen = ttk.Label(self.screenFrame, text="HOLA MUNDO", font=("Arial", 20, "bold"),justify="right")
+        self.screen.pack(padx=10, pady=10, expand=True)
+        self.GridButtons()
+
+        self.main.mainloop()
+
+    def GridButtons(self):
+        l= 0
+        for j in range (6):
+            for i in range (4):
+                if l < len(self.buttonsSimbols):
+                    self.buttons = ttk.Button(self.buttonsFrame, text= self.buttonsSimbols[l])
+                    self.buttons.grid(column=i, row=j,sticky="nsew", padx=5, pady=5)
+                    l +=1
+
+    def Configure(self):
+        for i in range(5):
+            self.mainFrame.rowconfigure(i, weight=1)
+        for i in range(4):
+            self.mainFrame.columnconfigure(i, weight=1)
+
+    def __str__(self):
+        return super().__str__()
+
+
+if __name__=="__main__":
+    calc = Calculator("Calculator", "300x400")
\ No newline at end of file
diff --git a/Projects/1-Beginner/Calculator-App/try.py b/Projects/1-Beginner/Calculator-App/try.py
new file mode 100644
index 00000000..2bab44d5
--- /dev/null
+++ b/Projects/1-Beginner/Calculator-App/try.py
@@ -0,0 +1,30 @@
+def sorted(word):
+    print(word)
+    word = list(word)
+    print(type(word), word)
+    word.sort()
+    print(word)
+    sortedword = ""
+    for i in word:
+        sortedword = sortedword + i
+    return sortedword
+
+def ranks(arr):
+    res = []
+    for i in range(len(arr)):
+        res.append(1)
+        for j in range(len(arr)):
+            if (arr[i] > arr[j]) == False and arr[i] != arr[j]:
+                res[i] = res[i] +1
+            # elif
+        print(res)
+
+
+
+
+
+
+
+arr = [2,4,5,1,1,6,8,4,5]
+
+res = ranks(arr)
\ No newline at end of file