diff --git a/dropshell-tool/src/main.cpp b/dropshell-tool/src/main.cpp
index 2937c76..fd58827 100644
--- a/dropshell-tool/src/main.cpp
+++ b/dropshell-tool/src/main.cpp
@@ -53,7 +53,7 @@
 
 
 */
-
+#include "version.hpp"
 #include "BashrcEditor.hpp"
 #include "DropshellScriptManager.hpp"
 #include "GetbinClient.hpp"
@@ -77,11 +77,17 @@ int main(int argc, char* argv[]) {
     } else if (command == "autocomplete") {
         // TODO: Implement autocomplete logic
     } else if (command == "version") {
-        // TODO: Print version
+        std::cout << dropshell::VERSION << std::endl;
     } else if (command == "create") {
         // TODO: Implement create logic
     } else if (command == "help") {
-        // TODO: Print help
+        std::cout << "Usage: dropshell-tool <command> [args...]" << std::endl;
+        std::cout << "Commands:" << std::endl;
+        std::cout << "  install <tool_name>" << std::endl;
+        std::cout << "  publish <tool_name:ARCH> <folder>" << std::endl;
+        std::cout << "  update <tool_name>" << std::endl;
+        std::cout << "  autocomplete <args>" << std::endl;
+        std::cout << "  version" << std::endl;
     } else {
         std::cout << "Unknown command: " << command << std::endl;
         return 1;