diff --git a/cmd/loop/main.go b/cmd/loop/main.go
index 90c895b..b8e1e02 100644
--- a/cmd/loop/main.go
+++ b/cmd/loop/main.go
@@ -83,6 +83,7 @@ func main() {
 	app.Commands = []cli.Command{
 		loopOutCommand, loopInCommand, termsCommand,
 		monitorCommand, quoteCommand, listAuthCommand,
+		listSwapsCommand, swapInfoCommand,
 	}
 
 	err := app.Run(os.Args)
diff --git a/cmd/loop/swaps.go b/cmd/loop/swaps.go
new file mode 100644
index 0000000..80df2e5
--- /dev/null
+++ b/cmd/loop/swaps.go
@@ -0,0 +1,92 @@
+package main
+
+import (
+	"context"
+	"encoding/hex"
+	"fmt"
+
+	"github.com/lightninglabs/loop/looprpc"
+	"github.com/lightningnetwork/lnd/lntypes"
+	"github.com/urfave/cli"
+)
+
+var listSwapsCommand = cli.Command{
+	Name:  "listswaps",
+	Usage: "list all swaps in the local database",
+	Description: "Allows the user to get a list of all swaps that are " +
+		"currently stored in the database",
+	Action: listSwaps,
+}
+
+func listSwaps(ctx *cli.Context) error {
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	resp, err := client.ListSwaps(
+		context.Background(), &looprpc.ListSwapsRequest{},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+	return nil
+}
+
+var swapInfoCommand = cli.Command{
+	Name:      "swapinfo",
+	Usage:     "show the status of a swap",
+	ArgsUsage: "id",
+	Description: "Allows the user to get the status of a single swap " +
+		"currently stored in the database",
+	Flags: []cli.Flag{
+		cli.Uint64Flag{
+			Name:  "id",
+			Usage: "the ID of the swap",
+		},
+	},
+	Action: swapInfo,
+}
+
+func swapInfo(ctx *cli.Context) error {
+	args := ctx.Args()
+
+	var id string
+	switch {
+	case ctx.IsSet("id"):
+		id = ctx.String("id")
+	case ctx.NArg() > 0:
+		id = args[0]
+		args = args.Tail()
+	default:
+		// Show command help if no arguments and flags were provided.
+		return cli.ShowCommandHelp(ctx, "swapinfo")
+	}
+
+	if len(id) != hex.EncodedLen(lntypes.HashSize) {
+		return fmt.Errorf("invalid swap ID")
+	}
+	idBytes, err := hex.DecodeString(id)
+	if err != nil {
+		return fmt.Errorf("cannot hex decode id: %v", err)
+	}
+
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	resp, err := client.SwapInfo(
+		context.Background(), &looprpc.SwapInfoRequest{Id: idBytes},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+	return nil
+}