diff --git a/homework/calculate/calculate.hpp b/homework/calculate/calculate.hpp
index 7a933a25..06efef4b 100644
--- a/homework/calculate/calculate.hpp
+++ b/homework/calculate/calculate.hpp
@@ -3,5 +3,25 @@
 
 std::string calculate(const std::string& command, int first, int second) {
     // TODO: Implement your solution here and return proper value
+    if (command == "add") {
+        return std::to_string(first + second);
+    }
+    else if (command == "subtract") {
+        return std::to_string(first - second);
+    }
+    else if (command == "multiply") {
+        return std::to_string(first * second);
+    }
+    else if (command == "divide") {
+        if (second != 0) {
+            return std::to_string(first / second);
+        } else {    
+            return "Division by 0";
+        }
+    }
+    else {
+        return "Invalid data";
+    }
+
     return "";
 }