diff --git a/homework/calculate/calculate.hpp b/homework/calculate/calculate.hpp
index 7a933a25..44e3c4e8 100644
--- a/homework/calculate/calculate.hpp
+++ b/homework/calculate/calculate.hpp
@@ -2,6 +2,17 @@
 #include <string>
 
 std::string calculate(const std::string& command, int first, int second) {
-    // TODO: Implement your solution here and return proper value
-    return "";
+    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 "Division by 0";
+        else
+            return std::to_string(first / second);
+    } else
+        return "Invalid data";
 }