diff --git a/main.go b/main.go
index d494c44..a3744be 100644
--- a/main.go
+++ b/main.go
@@ -20,6 +20,71 @@ var (
 	db *redis.Client
 )
 
+func bot() {
+	// Setup the session parameters
+	session, err := discordgo.New("Bot " + os.Getenv("BOT_TOKEN"))
+	if err != nil {
+		log.Fatalf("Invalid bot parameters: %v", err)
+	}
+
+	// Login handler
+	session.AddHandler(func(s *discordgo.Session, r *discordgo.Ready) {
+		log.Printf("Logged in as: %v#%v", s.State.User.Username, s.State.User.Discriminator)
+
+		// Count serers
+		guilds := s.State.Guilds
+		log.Printf("Connected to %d server%s", len(guilds), Plural(len(guilds)))
+	})
+
+	// Open the session
+	err = session.Open()
+	if err != nil {
+		log.Fatalf("Cannot open the session: %v", err)
+	}
+	defer session.Close()
+	defer client.CloseIdleConnections() // HTTP client
+
+	// Setup command handlers
+	session.AddHandler(func(internalSession *discordgo.Session, interaction *discordgo.InteractionCreate) {
+		if handler, ok := commandHandlers[interaction.ApplicationCommandData().Name]; ok {
+			handler(internalSession, interaction)
+		}
+	})
+
+	// Setup signals before adding commands in case we CTRL+C before/during command registration
+	stop := make(chan os.Signal, 1)
+	signal.Notify(stop, os.Interrupt)
+
+	// Register commands
+	log.Printf("Adding %d command%s...", len(commandDefinitions), Plural(len(commandDefinitions)))
+	registeredCommands := make([]*discordgo.ApplicationCommand, len(commandDefinitions))
+	for definitionIndex, commandDefinition := range commandDefinitions {
+		command, err := session.ApplicationCommandCreate(session.State.User.ID, os.Getenv("BOT_TARGET_GUILD"), commandDefinition)
+		if err != nil {
+			log.Panicf("Failed while registering '%v' command: %v", commandDefinition.Name, err)
+		}
+		registeredCommands[definitionIndex] = command
+	}
+
+	// Load the session
+	tryReload("")
+
+	// Wait here until CTRL-C or other term signal is received.
+	log.Println("Press Ctrl+C to exit")
+	<-stop
+
+	// Remove commands
+	log.Printf("Removing %d command%s...\n", len(registeredCommands), Plural(len(registeredCommands)))
+	for _, v := range registeredCommands {
+		err := session.ApplicationCommandDelete(session.State.User.ID, os.Getenv("BOT_TARGET_GUILD"), v.ID)
+		if err != nil {
+			log.Panicf("Cannot delete '%v' command: %v", v.Name, err)
+		}
+	}
+
+	log.Println("Gracefully shutting down.")
+}
+
 func main() {
 	// Load environment variables
 	if err := godotenv.Load(); err != nil {
@@ -38,58 +103,20 @@ func main() {
 	}
 	log.Printf("Redis connection established (%s).", ping_result)
 
-	session, err = discordgo.New("Bot " + os.Getenv("BOT_TOKEN"))
-	if err != nil {
-		log.Fatalf("Invalid bot parameters: %v", err)
+	command := ""
+	if len(os.Args) > 1 {
+		command = os.Args[1]
 	}
 
-	session.AddHandler(func(s *discordgo.Session, r *discordgo.Ready) {
-		log.Printf("Logged in as: %v#%v", s.State.User.Username, s.State.User.Discriminator)
-
-		// Count serers
-		guilds := s.State.Guilds
-		log.Printf("Connected to %d server%s", len(guilds), Plural(len(guilds)))
-	})
-	err = session.Open()
-	if err != nil {
-		log.Fatalf("Cannot open the session: %v", err)
+	switch command {
+	case "scan":
+		log.Printf("Running scan")
+		Scan()
+	case "bot":
+		log.Printf("Running bot")
+		bot()
+	default:
+		log.Printf("Running bot (default)")
+		bot()
 	}
-	defer session.Close()
-	defer client.CloseIdleConnections()
-
-	session.AddHandler(func(internalSession *discordgo.Session, interaction *discordgo.InteractionCreate) {
-		if handler, ok := commandHandlers[interaction.ApplicationCommandData().Name]; ok {
-			handler(internalSession, interaction)
-		}
-	})
-
-	log.Printf("Adding %d command%s...", len(commandDefinitions), Plural(len(commandDefinitions)))
-	registeredCommands := make([]*discordgo.ApplicationCommand, len(commandDefinitions))
-	for definitionIndex, commandDefinition := range commandDefinitions {
-		command, err := session.ApplicationCommandCreate(session.State.User.ID, os.Getenv("BOT_TARGET_GUILD"), commandDefinition)
-		if err != nil {
-			log.Panicf("Failed while registering '%v' command: %v", commandDefinition.Name, err)
-		}
-		registeredCommands[definitionIndex] = command
-	}
-
-	tryReload("")
-
-	stop := make(chan os.Signal, 1)
-	signal.Notify(stop, os.Interrupt)
-	log.Println("Press Ctrl+C to exit")
-	<-stop
-
-	if true {
-		log.Printf("Removing %d command%s...\n", len(registeredCommands), Plural(len(registeredCommands)))
-
-		for _, v := range registeredCommands {
-			err := session.ApplicationCommandDelete(session.State.User.ID, os.Getenv("BOT_TARGET_GUILD"), v.ID)
-			if err != nil {
-				log.Panicf("Cannot delete '%v' command: %v", v.Name, err)
-			}
-		}
-	}
-
-	log.Println("Gracefully shutting down.")
 }