diff --git a/accounting/config.go b/accounting/config.go
new file mode 100644
index 0000000..09c7955
--- /dev/null
+++ b/accounting/config.go
@@ -0,0 +1,126 @@
+package accounting
+
+import (
+	"context"
+	"time"
+
+	"github.com/lightninglabs/faraday/lndwrap"
+	"github.com/lightninglabs/lndclient"
+)
+
+// OffChainConfig contains all the functionality required to produce an off
+// chain report.
+type OffChainConfig struct {
+	// ListInvoices lists all our invoices.
+	ListInvoices func() ([]lndclient.Invoice, error)
+
+	// ListPayments lists all our payments.
+	ListPayments func() ([]lndclient.Payment, error)
+
+	// ListForwards lists all our forwards over out relevant period.
+	ListForwards func() ([]lndclient.ForwardingEvent, error)
+
+	// OwnPubKey is our node's public key. We use this value to identify
+	// payments that are made to our own node.
+	OwnPubKey string
+
+	// StartTime is the time from which the report should be created,
+	// inclusive.
+	StartTime time.Time
+
+	// EndTime is the time until which the report should be created,
+	// exclusive.
+	EndTime time.Time
+
+	// DisableFiat is set if we want to produce a report without fiat
+	// conversions. This is useful for testing, and for cases where our fiat
+	// data api may be down.
+	DisableFiat bool
+}
+
+// OnChainConfig contains all the functionality required to produce an on chain
+// report.
+type OnChainConfig struct {
+	// OpenChannels provides a list of all currently open channels.
+	OpenChannels func() ([]lndclient.ChannelInfo, error)
+
+	// ClosedChannels provides a list of all closed channels.
+	ClosedChannels func() ([]lndclient.ClosedChannel, error)
+
+	// OnChainTransactions provides a list of all on chain transactions
+	// relevant to our wallet over a block range.
+	OnChainTransactions func() ([]lndclient.Transaction, error)
+
+	// ListSweeps returns the transaction ids of the list of sweeps known
+	// to lnd.
+	ListSweeps func() ([]string, error)
+
+	// StartTime is the time from which the report should be created,
+	// inclusive.
+	StartTime time.Time
+
+	// EndTime is the time until which the report should be created,
+	// exclusive.
+	EndTime time.Time
+
+	// DisableFiat is set if we want to produce a report without fiat
+	// conversions. This is useful for testing, and for cases where our fiat
+	// data api may be down.
+	DisableFiat bool
+}
+
+// NewOnChainConfig returns an on chain config from the lnd services provided.
+func NewOnChainConfig(ctx context.Context, lnd lndclient.LndServices, startTime,
+	endTime time.Time, disableFiat bool) *OnChainConfig {
+
+	return &OnChainConfig{
+		OpenChannels: lndwrap.ListChannels(
+			ctx, lnd.Client, false,
+		),
+		ClosedChannels: func() ([]lndclient.ClosedChannel, error) {
+			return lnd.Client.ClosedChannels(ctx)
+		},
+		OnChainTransactions: func() ([]lndclient.Transaction, error) {
+			return lnd.Client.ListTransactions(ctx)
+		},
+		ListSweeps: func() ([]string, error) {
+			return lnd.WalletKit.ListSweeps(ctx)
+		},
+		StartTime:   startTime,
+		EndTime:     endTime,
+		DisableFiat: disableFiat,
+	}
+}
+
+// NewOffChainConfig creates a config for creating off chain reports. It takes
+// max parameters which allow control over the pagination size for queries to
+// lnd.
+func NewOffChainConfig(ctx context.Context, lnd lndclient.LndServices,
+	maxInvoices, maxPayments, maxForwards uint64, ownPubkey string,
+	startTime, endTime time.Time, disableFiat bool) *OffChainConfig {
+
+	return &OffChainConfig{
+		ListInvoices: func() ([]lndclient.Invoice, error) {
+			return lndwrap.ListInvoices(
+				ctx, 0, maxInvoices,
+				lnd.Client,
+			)
+		},
+		ListPayments: func() ([]lndclient.Payment, error) {
+			return lndwrap.ListPayments(
+				ctx, 0, maxPayments,
+				lnd.Client,
+			)
+		},
+		ListForwards: func() ([]lndclient.ForwardingEvent, error) {
+			return lndwrap.ListForwards(
+				ctx, maxForwards, startTime, endTime,
+				lnd.Client,
+			)
+		},
+		OwnPubKey:   ownPubkey,
+		StartTime:   startTime,
+		EndTime:     endTime,
+		DisableFiat: disableFiat,
+	}
+}
diff --git a/accounting/conversions.go b/accounting/conversions.go
index dd523b3..b2ab46b 100644
--- a/accounting/conversions.go
+++ b/accounting/conversions.go
@@ -34,8 +34,15 @@ func invertMsat(msat int64) int64 {
 // getConversion is a helper function which queries coincap for a relevant set
 // of price data and returns a convert function which can be used to get
 // individual price points from this data.
-func getConversion(ctx context.Context, startTime,
-	endTime time.Time) (msatToFiat, error) {
+func getConversion(ctx context.Context, startTime, endTime time.Time,
+	disableFiat bool) (msatToFiat, error) {
+
+	// If we don't want fiat values, just return a no-op function.
+	if disableFiat {
+		return func(_ int64, _ time.Time) (decimal.Decimal, error) {
+			return decimal.Zero, nil
+		}, nil
+	}
 
 	err := utils.ValidateTimeRange(startTime, endTime)
 	if err != nil {
diff --git a/accounting/off_chain.go b/accounting/off_chain.go
index 2881fd6..e1ab210 100644
--- a/accounting/off_chain.go
+++ b/accounting/off_chain.go
@@ -3,7 +3,6 @@ package accounting
 import (
 	"context"
 	"errors"
-	"time"
 
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lntypes"
@@ -30,35 +29,12 @@ var (
 		"supported, query more recent timestamp to exclude duplicates")
 )
 
-// OffChainConfig contains all the functionality required to produce an off
-// chain report.
-type OffChainConfig struct {
-	// ListInvoices lists all our invoices.
-	ListInvoices func() ([]lndclient.Invoice, error)
-
-	// ListPayments lists all our payments.
-	ListPayments func() ([]lndclient.Payment, error)
-
-	// ListForwards lists all our forwards over out relevant period.
-	ListForwards func() ([]lndclient.ForwardingEvent, error)
-
-	// OwnPubKey is our node's public key. We use this value to identify
-	// payments that are made to our own node.
-	OwnPubKey string
-
-	// StartTime is the time from which the report should be created,
-	// inclusive.
-	StartTime time.Time
-
-	// EndTime is the time until which the report should be created,
-	// exclusive.
-	EndTime time.Time
-}
-
 // OffChainReport gets a report of off chain activity using live price data.
 func OffChainReport(ctx context.Context, cfg *OffChainConfig) (Report, error) {
+	// Retrieve a function which can be used to query individual prices,
+	// or a no-op function if we do not want prices.
 	getPrice, err := getConversion(
-		ctx, cfg.StartTime, cfg.EndTime,
+		ctx, cfg.StartTime, cfg.EndTime, cfg.DisableFiat,
 	)
 	if err != nil {
 		return nil, err
diff --git a/accounting/on_chain.go b/accounting/on_chain.go
index 7b9e48b..a77b893 100644
--- a/accounting/on_chain.go
+++ b/accounting/on_chain.go
@@ -2,45 +2,21 @@ package accounting
 
 import (
 	"context"
-	"time"
 
 	"github.com/lightninglabs/faraday/utils"
 	"github.com/lightninglabs/lndclient"
 )
 
-// OnChainConfig contains all the functionality required to produce an on chain
-// report.
-type OnChainConfig struct {
-	// OpenChannels provides a list of all currently open channels.
-	OpenChannels func() ([]lndclient.ChannelInfo, error)
-
-	// ClosedChannels provides a list of all closed channels.
-	ClosedChannels func() ([]lndclient.ClosedChannel, error)
-
-	// OnChainTransactions provides a list of all on chain transactions
-	// relevant to our wallet over a block range.
-	OnChainTransactions func() ([]lndclient.Transaction, error)
-
-	// ListSweeps returns the transaction ids of the list of sweeps known
-	// to lnd.
-	ListSweeps func() ([]string, error)
-
-	// StartTime is the time from which the report should be created,
-	// inclusive.
-	StartTime time.Time
-
-	// EndTime is the time until which the report should be created,
-	// exclusive.
-	EndTime time.Time
-}
-
 // OnChainReport produces a report of our on chain activity for a period using
 // live price data. Note that this report relies on transactions returned by
 // GetTransactions in lnd. If a transaction is not included in this response
 // (eg, a remote party opening a channel to us), it will not be included.
 func OnChainReport(ctx context.Context, cfg *OnChainConfig) (Report, error) {
-	// Retrieve a function which can be used to query individual prices.
-	getPrice, err := getConversion(ctx, cfg.StartTime, cfg.EndTime)
+	// Retrieve a function which can be used to query individual prices,
+	// or a no-op function if we do not want prices.
+	getPrice, err := getConversion(
+		ctx, cfg.StartTime, cfg.EndTime, cfg.DisableFiat,
+	)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/frcli/node_report.go b/cmd/frcli/node_report.go
index bf8657b..f045076 100644
--- a/cmd/frcli/node_report.go
+++ b/cmd/frcli/node_report.go
@@ -36,6 +36,10 @@ var onChainReportCommand = cli.Command{
 				"set, the command will output the report. " +
 				"Note that write permissions are required.",
 		},
+		cli.BoolFlag{
+			Name:  "disable_fiat",
+			Usage: "Create a report without fiat conversions.",
+		},
 	},
 	Action: queryOnChainReport,
 }
@@ -47,8 +51,9 @@ func queryOnChainReport(ctx *cli.Context) error {
 	// Set start and end times from user specified values, defaulting
 	// to zero if they are not set.
 	req := &frdrpc.NodeReportRequest{
-		StartTime: uint64(ctx.Int64("start_time")),
-		EndTime:   uint64(ctx.Int64("end_time")),
+		StartTime:   uint64(ctx.Int64("start_time")),
+		EndTime:     uint64(ctx.Int64("end_time")),
+		DisableFiat: ctx.IsSet("disable_fiat"),
 	}
 
 	// If start time is zero, default to a week ago.
diff --git a/frdrpc/channel_insights.go b/frdrpc/channel_insights.go
index 1fec00a..b0d426b 100644
--- a/frdrpc/channel_insights.go
+++ b/frdrpc/channel_insights.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/lightninglabs/faraday/insights"
+	"github.com/lightninglabs/faraday/lndwrap"
 	"github.com/lightninglabs/faraday/revenue"
 )
 
@@ -24,7 +25,9 @@ func channelInsights(ctx context.Context,
 	}
 
 	return insights.GetChannels(&insights.Config{
-		OpenChannels: cfg.wrapListChannels(ctx, false),
+		OpenChannels: lndwrap.ListChannels(
+			ctx, cfg.Lnd.Client, false,
+		),
 		CurrentHeight: func() (u uint32, err error) {
 			info, err := cfg.Lnd.Client.GetInfo(ctx)
 			if err != nil {
diff --git a/frdrpc/node_report.go b/frdrpc/node_report.go
index 21d4493..1fc0868 100644
--- a/frdrpc/node_report.go
+++ b/frdrpc/node_report.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/lightninglabs/faraday/accounting"
-	"github.com/lightninglabs/lndclient"
 )
 
 // parseNodeReportRequest parses a report request and returns the config
@@ -20,42 +19,23 @@ func parseNodeReportRequest(ctx context.Context, cfg *Config,
 		return nil, nil, err
 	}
 
-	onChain := &accounting.OnChainConfig{
-		OpenChannels: cfg.wrapListChannels(ctx, false),
-		ClosedChannels: func() ([]lndclient.ClosedChannel, error) {
-			return cfg.Lnd.Client.ClosedChannels(ctx)
-		},
-		OnChainTransactions: func() ([]lndclient.Transaction, error) {
-			return cfg.Lnd.Client.ListTransactions(ctx)
-		},
-		ListSweeps: func() ([]string, error) {
-			return cfg.Lnd.WalletKit.ListSweeps(ctx)
-		},
-		StartTime: start,
-		EndTime:   end,
-	}
-
 	// We lookup our pubkey once so that our paid to self function does
 	// not need to do a lookup for every payment it checks.
 	info, err := cfg.Lnd.Client.GetInfo(ctx)
 	if err != nil {
 		return nil, nil, err
 	}
+	pubkey := hex.EncodeToString(info.IdentityPubkey[:])
 
-	offChain := &accounting.OffChainConfig{
-		ListInvoices: func() ([]lndclient.Invoice, error) {
-			return cfg.wrapListInvoices(ctx)
-		},
-		ListPayments: func() ([]lndclient.Payment, error) {
-			return cfg.wrapListPayments(ctx)
-		},
-		ListForwards: func() ([]lndclient.ForwardingEvent, error) {
-			return cfg.wrapListForwards(ctx, start, end)
-		},
-		OwnPubKey: hex.EncodeToString(info.IdentityPubkey[:]),
-		StartTime: start,
-		EndTime:   end,
-	}
+	offChain := accounting.NewOffChainConfig(
+		ctx, cfg.Lnd, uint64(maxInvoiceQueries),
+		uint64(maxPaymentQueries), uint64(maxForwardQueries),
+		pubkey, start, end, req.DisableFiat,
+	)
+
+	onChain := accounting.NewOnChainConfig(
+		ctx, cfg.Lnd, start, end, req.DisableFiat,
+	)
 
 	return onChain, offChain, nil
 }
diff --git a/frdrpc/revenue_report.go b/frdrpc/revenue_report.go
index 8eaaa46..cb7e59e 100644
--- a/frdrpc/revenue_report.go
+++ b/frdrpc/revenue_report.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/lightninglabs/faraday/lndwrap"
 	"github.com/lightninglabs/faraday/revenue"
 	"github.com/lightninglabs/lndclient"
 )
@@ -44,7 +45,7 @@ func getRevenueConfig(ctx context.Context, cfg *Config,
 	}
 
 	return &revenue.Config{
-		ListChannels: cfg.wrapListChannels(ctx, false),
+		ListChannels: lndwrap.ListChannels(ctx, cfg.Lnd.Client, false),
 		ClosedChannels: func() ([]lndclient.ClosedChannel, error) {
 			return cfg.Lnd.Client.ClosedChannels(ctx)
 		},
diff --git a/frdrpc/rpc.pb.go b/frdrpc/rpc.pb.go
index 06d24fa..7915f27 100644
--- a/frdrpc/rpc.pb.go
+++ b/frdrpc/rpc.pb.go
@@ -1017,7 +1017,11 @@ type NodeReportRequest struct {
 	// The unix time from which to produce the report, inclusive.
 	StartTime uint64 `protobuf:"varint,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The unix time until which to produce the report, exclusive.
-	EndTime              uint64   `protobuf:"varint,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime uint64 `protobuf:"varint,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	//
+	//Set to generate a report without conversion to fiat. If set, fiat values
+	//will display as 0.
+	DisableFiat          bool     `protobuf:"varint,4,opt,name=disable_fiat,json=disableFiat,proto3" json:"disable_fiat,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1062,6 +1066,13 @@ func (m *NodeReportRequest) GetEndTime() uint64 {
 	return 0
 }
 
+func (m *NodeReportRequest) GetDisableFiat() bool {
+	if m != nil {
+		return m.DisableFiat
+	}
+	return false
+}
+
 type ReportEntry struct {
 	// The unix timestamp of the event.
 	Timestamp uint64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
@@ -1251,102 +1262,103 @@ func init() {
 func init() { proto.RegisterFile("rpc.proto", fileDescriptor_77a6da22d6a3feb1) }
 
 var fileDescriptor_77a6da22d6a3feb1 = []byte{
-	// 1516 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0xdb, 0xca,
-	0x15, 0x2e, 0x29, 0x59, 0x8f, 0x23, 0x4b, 0xa6, 0xc7, 0x8e, 0xa3, 0x28, 0x4e, 0x62, 0x10, 0x49,
-	0xa3, 0xbc, 0xac, 0x44, 0xdd, 0x14, 0x05, 0x0a, 0x54, 0x50, 0xe8, 0x44, 0xa9, 0xf5, 0xc0, 0x58,
-	0x4e, 0x50, 0xa0, 0x05, 0xc1, 0x52, 0x63, 0x9b, 0xad, 0xf8, 0xc8, 0x70, 0x64, 0xd4, 0x28, 0xba,
-	0xe9, 0xb6, 0x28, 0xba, 0xc8, 0xa6, 0x9b, 0xee, 0xfa, 0x23, 0xba, 0xec, 0x0f, 0xe8, 0xa6, 0xb8,
-	0xb8, 0xff, 0xe0, 0xfe, 0x81, 0xbb, 0xbb, 0xcb, 0x8b, 0x79, 0x90, 0x22, 0x15, 0xd9, 0xb9, 0x9b,
-	0xbb, 0xe3, 0x7c, 0xdf, 0x37, 0xe7, 0x9c, 0x39, 0x73, 0x74, 0xe6, 0x08, 0xaa, 0x34, 0x72, 0x0f,
-	0x23, 0x1a, 0xb2, 0x10, 0x95, 0xce, 0xe8, 0x8c, 0x46, 0x6e, 0x6b, 0xff, 0x3c, 0x0c, 0xcf, 0xe7,
-	0xa4, 0xe3, 0x44, 0x5e, 0xc7, 0x09, 0x82, 0x90, 0x39, 0xcc, 0x0b, 0x83, 0x58, 0xaa, 0xcc, 0xef,
-	0x34, 0x68, 0xf5, 0xe7, 0x61, 0x4c, 0x30, 0x71, 0x43, 0xdf, 0x27, 0xc1, 0x4c, 0xd0, 0x98, 0x7c,
-	0x5c, 0x90, 0x98, 0xa1, 0x67, 0xb0, 0xed, 0x7b, 0x81, 0xe7, 0x2f, 0x7c, 0xdb, 0x0f, 0x03, 0x8f,
-	0x85, 0x94, 0xcc, 0x9a, 0xda, 0x81, 0xd6, 0x2e, 0x60, 0x43, 0x11, 0xc3, 0x04, 0x47, 0x3d, 0x28,
-	0xf9, 0x84, 0x51, 0xcf, 0x6d, 0xea, 0x07, 0x5a, 0xbb, 0xd1, 0x7d, 0x72, 0x28, 0x43, 0x38, 0xbc,
-	0xde, 0xc1, 0xe1, 0x50, 0x6c, 0xc0, 0x6a, 0xa3, 0xf9, 0x07, 0x28, 0x49, 0x04, 0xd5, 0xa0, 0x7c,
-	0x3a, 0xfa, 0xf5, 0x68, 0xfc, 0x61, 0x64, 0xfc, 0x04, 0x01, 0x94, 0x4e, 0x27, 0xd3, 0xc1, 0xd0,
-	0x32, 0x34, 0x4e, 0x60, 0xeb, 0xbd, 0x35, 0x3a, 0xb5, 0x0c, 0x1d, 0xed, 0xc0, 0xd6, 0x60, 0xd4,
-	0x1f, 0x0f, 0x07, 0xa3, 0x37, 0xf6, 0xfb, 0xf1, 0xf1, 0xe9, 0xd0, 0x32, 0x0a, 0x1c, 0x1c, 0x9f,
-	0x4e, 0xdf, 0x8c, 0x33, 0x60, 0x11, 0x19, 0xb0, 0x39, 0x1d, 0x4f, 0x7b, 0xc7, 0x09, 0xb2, 0x61,
-	0x7e, 0xd2, 0xe0, 0xde, 0x78, 0xc1, 0xe6, 0x1e, 0xa1, 0xf9, 0xd8, 0xe2, 0xe4, 0xf4, 0x7d, 0xa8,
-	0x51, 0xe2, 0xda, 0x54, 0x2e, 0xc5, 0xb9, 0x6b, 0x5d, 0xf3, 0xcb, 0xa7, 0xc2, 0x40, 0x89, 0x9b,
-	0x18, 0x79, 0x01, 0x28, 0x94, 0x5e, 0x6c, 0x7f, 0x31, 0x67, 0x5e, 0xc4, 0x3f, 0x45, 0x86, 0x74,
-	0xbc, 0xad, 0x98, 0x61, 0x4a, 0x98, 0xff, 0xd0, 0xe0, 0xc1, 0xf4, 0x82, 0x92, 0xf8, 0x22, 0x9c,
-	0xcf, 0x7e, 0xcc, 0xb8, 0x1e, 0xc3, 0x16, 0x4b, 0xfc, 0xd8, 0x97, 0xce, 0x7c, 0x41, 0x54, 0x50,
-	0x8d, 0x14, 0x7e, 0xcf, 0x51, 0xf3, 0x3f, 0x1a, 0xec, 0xaf, 0xb1, 0x19, 0x63, 0x12, 0x47, 0x61,
-	0x10, 0x13, 0xf4, 0x08, 0x1a, 0x2c, 0x64, 0xce, 0xdc, 0x76, 0x2f, 0x9c, 0x20, 0x20, 0xf3, 0x58,
-	0x44, 0xb4, 0x81, 0xeb, 0x02, 0xed, 0x2b, 0x10, 0x75, 0x60, 0xc7, 0x0d, 0x83, 0xd8, 0x9b, 0x11,
-	0x4a, 0x66, 0x4b, 0xad, 0x2e, 0xb4, 0x68, 0x49, 0xa5, 0x1b, 0x7e, 0x05, 0x5b, 0x34, 0xef, 0xb2,
-	0x59, 0x38, 0x28, 0xb4, 0x6b, 0xdd, 0xbd, 0xe4, 0xa8, 0x2b, 0xa7, 0x5c, 0x95, 0x9b, 0x01, 0x34,
-	0xf2, 0x12, 0x74, 0x0f, 0x80, 0x7b, 0xb6, 0xa3, 0xd0, 0x0b, 0x64, 0xe6, 0xaa, 0xb8, 0xca, 0x91,
-	0x09, 0x07, 0xd0, 0x2e, 0x6c, 0x64, 0x53, 0x21, 0x17, 0x3c, 0x55, 0xa9, 0x65, 0xdb, 0xe5, 0xa9,
-	0x68, 0x16, 0x0e, 0xb4, 0x76, 0x05, 0x37, 0x52, 0x58, 0x24, 0xc8, 0xfc, 0x08, 0xbb, 0x98, 0x5c,
-	0x92, 0x60, 0x41, 0x30, 0x89, 0x42, 0xca, 0x92, 0x5c, 0x3f, 0x80, 0xda, 0xd2, 0x2b, 0x4f, 0x4f,
-	0xa1, 0x5d, 0xc5, 0x90, 0xba, 0x8d, 0x79, 0x58, 0x31, 0x73, 0x28, 0xb3, 0x99, 0xe7, 0x4b, 0xe7,
-	0x45, 0x5c, 0x15, 0xc8, 0xd4, 0xf3, 0x09, 0xba, 0x03, 0x15, 0xee, 0x5a, 0x90, 0x05, 0x41, 0x96,
-	0x49, 0x30, 0xe3, 0x94, 0xf9, 0x16, 0x6e, 0xad, 0xb8, 0x54, 0xb7, 0xd2, 0x81, 0x32, 0x15, 0x88,
-	0xf4, 0x57, 0xeb, 0xde, 0x5a, 0x66, 0x2d, 0xab, 0x4f, 0x54, 0xe6, 0xd7, 0x1a, 0xd4, 0x73, 0x94,
-	0xb8, 0x58, 0x87, 0x9e, 0x13, 0x96, 0xdc, 0x96, 0x4a, 0x58, 0x5d, 0xa2, 0xea, 0xa2, 0xd0, 0x00,
-	0x36, 0x23, 0xc7, 0xa3, 0x76, 0xe2, 0x4e, 0x17, 0xee, 0x7e, 0xba, 0xd6, 0xdd, 0xe1, 0xc4, 0xf1,
-	0xa8, 0xfc, 0x8c, 0xad, 0x80, 0xd1, 0x2b, 0x5c, 0x8b, 0x96, 0x48, 0x0b, 0x83, 0xb1, 0x2a, 0x40,
-	0x06, 0x14, 0xfe, 0x48, 0xae, 0x94, 0x6b, 0xfe, 0x89, 0xda, 0xd9, 0x5b, 0xaa, 0x75, 0x51, 0xe2,
-	0x69, 0xb9, 0x55, 0xdd, 0xdc, 0x2f, 0xf4, 0x9f, 0x6b, 0xe6, 0xff, 0x34, 0x80, 0x25, 0x83, 0x5e,
-	0xc2, 0xae, 0xe3, 0x87, 0x8b, 0x80, 0xd9, 0xe1, 0x82, 0x9d, 0x87, 0x5e, 0x70, 0x6e, 0xfb, 0xb1,
-	0xc3, 0x54, 0x57, 0x43, 0x92, 0x1b, 0x2b, 0x6a, 0x18, 0x3b, 0x0c, 0x3d, 0x07, 0x74, 0x46, 0x48,
-	0xbc, 0xa2, 0xd7, 0x65, 0x17, 0xe4, 0x4c, 0x4e, 0xbd, 0xb4, 0xef, 0x05, 0x6e, 0xe8, 0xa7, 0xfa,
-	0x42, 0xd6, 0xfe, 0x40, 0x51, 0x39, 0xfb, 0x79, 0x7d, 0x71, 0x69, 0x3f, 0xab, 0x36, 0x9b, 0xb0,
-	0xa7, 0x12, 0x3f, 0x08, 0x62, 0xef, 0xfc, 0x82, 0x25, 0x6d, 0xc1, 0xfc, 0x2d, 0xdc, 0xfe, 0x8c,
-	0x51, 0xc5, 0xd0, 0x03, 0x43, 0x5d, 0xa1, 0xed, 0x29, 0x4e, 0x55, 0x45, 0xfa, 0x5b, 0xca, 0x6f,
-	0xc5, 0x5b, 0x6e, 0xde, 0x94, 0xf9, 0x7f, 0x1d, 0x1a, 0x79, 0xcd, 0x97, 0x7e, 0x4c, 0xfc, 0xf1,
-	0x48, 0x1e, 0x07, 0x3b, 0x26, 0x6e, 0x18, 0xcc, 0x62, 0x55, 0xdb, 0x46, 0x4a, 0x9c, 0x48, 0x9c,
-	0xd7, 0xda, 0x22, 0xe2, 0x05, 0x9e, 0x2a, 0x65, 0xa1, 0xd7, 0x25, 0x9a, 0xc8, 0x5e, 0xc2, 0xee,
-	0x65, 0x38, 0x5f, 0xf8, 0x64, 0x6d, 0xb6, 0x90, 0xe4, 0x72, 0xd9, 0x5d, 0xee, 0xc8, 0xdf, 0xdf,
-	0x46, 0x76, 0x47, 0xee, 0x06, 0xdb, 0x20, 0xb2, 0x6e, 0x13, 0x87, 0x06, 0x64, 0x26, 0xd5, 0x25,
-	0xa1, 0x6e, 0x70, 0xdc, 0x12, 0xb0, 0x50, 0x3e, 0x84, 0xba, 0x1b, 0x06, 0x67, 0x1e, 0xf5, 0x55,
-	0x7f, 0x2a, 0x1f, 0x68, 0xed, 0x3a, 0xce, 0x83, 0xa8, 0x09, 0xe5, 0x88, 0x7a, 0x97, 0x0e, 0x23,
-	0xcd, 0x8a, 0x68, 0x1b, 0xc9, 0xd2, 0xfc, 0xaf, 0x06, 0x3b, 0x47, 0x9e, 0xc3, 0xac, 0x98, 0x79,
-	0xbe, 0xc3, 0x48, 0xd2, 0x2f, 0x5e, 0x43, 0x45, 0x35, 0xf7, 0xe4, 0x9a, 0xda, 0xc9, 0x35, 0xad,
-	0x91, 0x1f, 0x4e, 0xa8, 0xe7, 0x26, 0x0b, 0x9c, 0xee, 0x6c, 0xfd, 0x0e, 0x36, 0xb3, 0x0c, 0x6a,
-	0x80, 0xee, 0xcd, 0xd4, 0x35, 0xe9, 0xde, 0x8c, 0x77, 0x25, 0x55, 0xa9, 0x69, 0x41, 0x17, 0x31,
-	0x48, 0x48, 0x1c, 0x6f, 0x1f, 0xaa, 0x3c, 0xf7, 0x31, 0x73, 0xfc, 0x48, 0xd5, 0xef, 0x12, 0x78,
-	0x57, 0xac, 0xe8, 0x46, 0xc1, 0xfc, 0xb7, 0x06, 0xbb, 0xf9, 0x98, 0x54, 0xc9, 0x0d, 0xa1, 0x76,
-	0xe6, 0x39, 0x4c, 0x3e, 0x2d, 0xc9, 0x31, 0x9e, 0xaf, 0x3f, 0x86, 0xdc, 0x22, 0x40, 0xf1, 0xe6,
-	0xa8, 0xd6, 0x00, 0x67, 0x29, 0xd0, 0xfa, 0x25, 0x6c, 0xad, 0xd0, 0x6b, 0x1a, 0x43, 0xae, 0x7d,
-	0x57, 0xb3, 0x4d, 0xe0, 0x04, 0xb6, 0x47, 0xe1, 0x6c, 0xa5, 0x2d, 0xe7, 0xbb, 0xae, 0x76, 0x53,
-	0xd7, 0xd5, 0x73, 0x5d, 0xf7, 0x5d, 0xb1, 0x52, 0x30, 0x8a, 0xe6, 0xdf, 0x75, 0xa8, 0x49, 0x8b,
-	0x32, 0xa0, 0x5c, 0xbe, 0x94, 0xb9, 0x14, 0xe0, 0xe6, 0xc2, 0x80, 0x77, 0x52, 0x2f, 0x10, 0xe6,
-	0x2a, 0xb8, 0x1c, 0x06, 0x7d, 0xbe, 0x44, 0x7b, 0x50, 0x92, 0x69, 0x57, 0x45, 0xaf, 0x56, 0x1c,
-	0x77, 0x29, 0x99, 0x79, 0xb2, 0xbe, 0x2b, 0x58, 0xad, 0xf8, 0x39, 0x9d, 0x38, 0x26, 0xb2, 0x88,
-	0xab, 0x58, 0x2e, 0xd0, 0x23, 0x28, 0xb2, 0xab, 0x88, 0x88, 0x5a, 0x6d, 0x74, 0xb7, 0x93, 0x54,
-	0x8b, 0xd8, 0xa6, 0x57, 0x11, 0xc1, 0x82, 0x46, 0x08, 0x8a, 0xec, 0x4f, 0xde, 0x4c, 0xd4, 0x6a,
-	0x15, 0x8b, 0x6f, 0x8e, 0xf1, 0x5c, 0x8b, 0xfa, 0xac, 0x62, 0xf1, 0xcd, 0x4f, 0x43, 0xc9, 0x19,
-	0xa1, 0x24, 0x70, 0x49, 0xb3, 0x2a, 0x7f, 0xdc, 0x29, 0xc0, 0x77, 0x04, 0x21, 0x23, 0x4d, 0x90,
-	0x3b, 0xf8, 0xb7, 0xd9, 0x07, 0x94, 0x4d, 0xb2, 0x2a, 0x84, 0x17, 0xab, 0x0f, 0xd1, 0xce, 0xf2,
-	0x65, 0x48, 0x73, 0x97, 0x3e, 0x43, 0x4f, 0xff, 0xa6, 0x43, 0x35, 0x0d, 0x39, 0x3f, 0x06, 0xee,
-	0x01, 0x3a, 0x1e, 0xf7, 0x7b, 0xc7, 0x76, 0xff, 0x6d, 0x6f, 0x34, 0xb2, 0x8e, 0xed, 0xf1, 0xc4,
-	0x1a, 0x19, 0x1a, 0xba, 0x0d, 0x3b, 0xd8, 0x1a, 0x8e, 0xa7, 0x56, 0x9e, 0xd0, 0xd1, 0x2e, 0x18,
-	0x59, 0xc4, 0x3e, 0xb2, 0xf8, 0x7c, 0xb8, 0x0d, 0xf5, 0x04, 0xed, 0x1f, 0x8f, 0x4f, 0xf8, 0x74,
-	0x28, 0x86, 0xca, 0xbe, 0x35, 0x98, 0x4c, 0x8d, 0x0d, 0xbe, 0x98, 0xf4, 0x7e, 0x33, 0xb4, 0x46,
-	0x53, 0xa3, 0x84, 0xca, 0x50, 0xe0, 0xbb, 0xca, 0xc2, 0xd6, 0x00, 0xf7, 0x4f, 0x8f, 0x7b, 0xd8,
-	0x4e, 0xb4, 0x15, 0xae, 0x3d, 0x1a, 0xe3, 0x0f, 0x3d, 0xfc, 0xda, 0xa8, 0xa2, 0x2d, 0xa8, 0xa9,
-	0x85, 0xf0, 0x04, 0xb9, 0x3d, 0x89, 0xc9, 0x1a, 0x1f, 0x45, 0x53, 0x94, 0xeb, 0x36, 0x51, 0x15,
-	0x36, 0x4e, 0x3e, 0x58, 0xd6, 0xc4, 0xa8, 0xa3, 0x3a, 0x54, 0xc5, 0xa7, 0x60, 0x1a, 0xdd, 0x6f,
-	0x37, 0xa0, 0x7e, 0xe4, 0x50, 0x67, 0xe6, 0x5c, 0x9d, 0x10, 0x7a, 0x49, 0x28, 0xfa, 0xa7, 0x06,
-	0x7b, 0xeb, 0xc7, 0x56, 0xf4, 0x28, 0x49, 0xec, 0x8d, 0x63, 0x6d, 0xeb, 0xe1, 0x0d, 0x93, 0x62,
-	0xfa, 0x64, 0x98, 0xaf, 0xfe, 0xfa, 0xd5, 0x37, 0x9f, 0xf4, 0x67, 0xe8, 0x49, 0xe7, 0xf2, 0x55,
-	0xe7, 0x4c, 0x86, 0xd0, 0x51, 0xf3, 0x6a, 0xdc, 0xf9, 0x73, 0x66, 0x00, 0x3d, 0x94, 0xc3, 0xfb,
-	0x5f, 0xd0, 0xbf, 0x34, 0x68, 0x5e, 0x37, 0xbb, 0xa2, 0xc7, 0x89, 0xd7, 0x2f, 0x4c, 0xb7, 0x3f,
-	0x30, 0xbc, 0xae, 0x08, 0xef, 0x39, 0x7a, 0x9a, 0x0d, 0x2f, 0x9d, 0x5c, 0xd7, 0xc7, 0xe7, 0xad,
-	0x0e, 0x38, 0xfb, 0xeb, 0x47, 0x22, 0x15, 0xc8, 0xbd, 0x6b, 0x58, 0x15, 0xc1, 0x5d, 0x11, 0xc1,
-	0x2d, 0xb4, 0x93, 0x8d, 0x80, 0x4a, 0x29, 0x8a, 0x60, 0x6b, 0xe5, 0x2d, 0x46, 0xf7, 0xd7, 0xbf,
-	0xb4, 0xe9, 0xb9, 0x1f, 0x5c, 0xcb, 0x2b, 0x87, 0xfb, 0xc2, 0xe1, 0x1e, 0xda, 0xcd, 0x3a, 0x4c,
-	0x9e, 0x73, 0xe4, 0xc2, 0x66, 0xb6, 0xa9, 0xa2, 0xbb, 0x37, 0xbc, 0x18, 0xad, 0xfd, 0x9b, 0xfa,
-	0xb0, 0xd9, 0x14, 0x8e, 0x10, 0x32, 0xb2, 0x8e, 0x44, 0x4f, 0x70, 0x01, 0x96, 0xbf, 0x70, 0x74,
-	0x27, 0xb1, 0xf2, 0x59, 0x6b, 0x6d, 0xb5, 0xd6, 0x51, 0xca, 0xfc, 0x7d, 0x61, 0xbe, 0x89, 0xf6,
-	0xb2, 0xe6, 0x83, 0x90, 0x0f, 0xff, 0x5c, 0xf7, 0xfb, 0x92, 0xf8, 0x6b, 0xfa, 0xb3, 0xef, 0x03,
-	0x00, 0x00, 0xff, 0xff, 0xbe, 0x5c, 0xbf, 0x28, 0xcd, 0x0e, 0x00, 0x00,
+	// 1534 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0x1b, 0x47,
+	0x12, 0xde, 0x19, 0x52, 0x7c, 0x14, 0x45, 0x6a, 0xd4, 0x92, 0x65, 0x9a, 0x96, 0x6d, 0xed, 0xc0,
+	0x5e, 0xd3, 0x2f, 0xd1, 0xe6, 0x5e, 0x16, 0x0b, 0x2c, 0xb0, 0x04, 0x3d, 0xb2, 0xe9, 0x15, 0x1f,
+	0x18, 0x51, 0x36, 0x16, 0xd8, 0xc5, 0x60, 0x3c, 0xd3, 0x92, 0x66, 0x97, 0xf3, 0x70, 0x4f, 0x53,
+	0x58, 0x61, 0x91, 0x4b, 0xae, 0x41, 0x90, 0x83, 0x2f, 0xb9, 0xe4, 0x96, 0x1f, 0x91, 0x63, 0x7e,
+	0x40, 0x2e, 0x41, 0x90, 0x7f, 0x90, 0x3f, 0x90, 0x5b, 0x8e, 0x41, 0x3f, 0x66, 0x38, 0x43, 0x53,
+	0x72, 0x2e, 0xb9, 0x75, 0x7f, 0x55, 0x5d, 0x5f, 0x75, 0x55, 0x4d, 0x75, 0x0d, 0x54, 0x49, 0xe4,
+	0xec, 0x47, 0x24, 0xa4, 0x21, 0x2a, 0x9d, 0x10, 0x97, 0x44, 0x4e, 0x6b, 0xf7, 0x34, 0x0c, 0x4f,
+	0x67, 0xb8, 0x63, 0x47, 0x5e, 0xc7, 0x0e, 0x82, 0x90, 0xda, 0xd4, 0x0b, 0x83, 0x58, 0x68, 0xe9,
+	0xbf, 0x28, 0xd0, 0xea, 0xcf, 0xc2, 0x18, 0x9b, 0xd8, 0x09, 0x7d, 0x1f, 0x07, 0x2e, 0x17, 0x9b,
+	0xf8, 0xdd, 0x1c, 0xc7, 0x14, 0x3d, 0x82, 0x4d, 0xdf, 0x0b, 0x3c, 0x7f, 0xee, 0x5b, 0x7e, 0x18,
+	0x78, 0x34, 0x24, 0xd8, 0x6d, 0x2a, 0x7b, 0x4a, 0xbb, 0x60, 0x6a, 0x52, 0x30, 0x4c, 0x70, 0xd4,
+	0x83, 0x92, 0x8f, 0x29, 0xf1, 0x9c, 0xa6, 0xba, 0xa7, 0xb4, 0x1b, 0xdd, 0x07, 0xfb, 0xc2, 0x85,
+	0xfd, 0xcb, 0x09, 0xf6, 0x87, 0xfc, 0x80, 0x29, 0x0f, 0xea, 0xff, 0x81, 0x92, 0x40, 0x50, 0x0d,
+	0xca, 0xc7, 0xa3, 0x7f, 0x8c, 0xc6, 0x6f, 0x46, 0xda, 0x1f, 0x10, 0x40, 0xe9, 0x78, 0x32, 0x1d,
+	0x0c, 0x0d, 0x4d, 0x61, 0x02, 0xd3, 0x78, 0x6d, 0x8c, 0x8e, 0x0d, 0x4d, 0x45, 0x5b, 0xb0, 0x31,
+	0x18, 0xf5, 0xc7, 0xc3, 0xc1, 0xe8, 0x85, 0xf5, 0x7a, 0x7c, 0x78, 0x3c, 0x34, 0xb4, 0x02, 0x03,
+	0xc7, 0xc7, 0xd3, 0x17, 0xe3, 0x0c, 0x58, 0x44, 0x1a, 0xac, 0x4f, 0xc7, 0xd3, 0xde, 0x61, 0x82,
+	0xac, 0xe9, 0xef, 0x15, 0xb8, 0x35, 0x9e, 0xd3, 0x99, 0x87, 0x49, 0xde, 0xb7, 0x38, 0xb9, 0x7d,
+	0x1f, 0x6a, 0x04, 0x3b, 0x16, 0x11, 0x5b, 0x7e, 0xef, 0x5a, 0x57, 0xff, 0xf8, 0xad, 0x4c, 0x20,
+	0xd8, 0x49, 0x8c, 0x3c, 0x01, 0x14, 0x0a, 0x16, 0xcb, 0x9f, 0xcf, 0xa8, 0x17, 0xb1, 0x25, 0x8f,
+	0x90, 0x6a, 0x6e, 0x4a, 0xc9, 0x30, 0x15, 0xe8, 0x5f, 0x28, 0x70, 0x67, 0x7a, 0x46, 0x70, 0x7c,
+	0x16, 0xce, 0xdc, 0xdf, 0xd3, 0xaf, 0xfb, 0xb0, 0x41, 0x13, 0x1e, 0xeb, 0xdc, 0x9e, 0xcd, 0xb1,
+	0x74, 0xaa, 0x91, 0xc2, 0xaf, 0x19, 0xaa, 0x7f, 0xa3, 0xc0, 0xee, 0x0a, 0x9b, 0xb1, 0x89, 0xe3,
+	0x28, 0x0c, 0x62, 0x8c, 0xee, 0x41, 0x83, 0x86, 0xd4, 0x9e, 0x59, 0xce, 0x99, 0x1d, 0x04, 0x78,
+	0x16, 0x73, 0x8f, 0xd6, 0xcc, 0x3a, 0x47, 0xfb, 0x12, 0x44, 0x1d, 0xd8, 0x72, 0xc2, 0x20, 0xf6,
+	0x5c, 0x4c, 0xb0, 0xbb, 0xd0, 0x55, 0xb9, 0x2e, 0x5a, 0x88, 0xd2, 0x03, 0x7f, 0x87, 0x0d, 0x92,
+	0xa7, 0x6c, 0x16, 0xf6, 0x0a, 0xed, 0x5a, 0x77, 0x27, 0xb9, 0xea, 0xd2, 0x2d, 0x97, 0xd5, 0xf5,
+	0x00, 0x1a, 0x79, 0x15, 0x74, 0x0b, 0x80, 0x31, 0x5b, 0x51, 0xe8, 0x05, 0x22, 0x72, 0x55, 0xb3,
+	0xca, 0x90, 0x09, 0x03, 0xd0, 0x36, 0xac, 0x65, 0x43, 0x21, 0x36, 0x2c, 0x54, 0xa9, 0x65, 0xcb,
+	0x61, 0xa1, 0x68, 0x16, 0xf6, 0x94, 0x76, 0xc5, 0x6c, 0xa4, 0x30, 0x0f, 0x90, 0xfe, 0x0e, 0xb6,
+	0x4d, 0x7c, 0x8e, 0x83, 0x39, 0x36, 0x71, 0x14, 0x12, 0x9a, 0xc4, 0xfa, 0x0e, 0xd4, 0x16, 0xac,
+	0x2c, 0x3c, 0x85, 0x76, 0xd5, 0x84, 0x94, 0x36, 0x66, 0x6e, 0xc5, 0xd4, 0x26, 0xd4, 0xa2, 0x9e,
+	0x2f, 0xc8, 0x8b, 0x66, 0x95, 0x23, 0x53, 0xcf, 0xc7, 0xe8, 0x06, 0x54, 0x18, 0x35, 0x17, 0x16,
+	0xb8, 0xb0, 0x8c, 0x03, 0x97, 0x89, 0xf4, 0x97, 0x70, 0x6d, 0x89, 0x52, 0x66, 0xa5, 0x03, 0x65,
+	0xc2, 0x11, 0xc1, 0x57, 0xeb, 0x5e, 0x5b, 0x44, 0x2d, 0xab, 0x9f, 0x68, 0xe9, 0x3f, 0x2a, 0x50,
+	0xcf, 0x89, 0x78, 0x62, 0x6d, 0x72, 0x8a, 0x69, 0x92, 0x2d, 0x19, 0xb0, 0xba, 0x40, 0x65, 0xa2,
+	0xd0, 0x00, 0xd6, 0x23, 0xdb, 0x23, 0x56, 0x42, 0xa7, 0x72, 0xba, 0x3f, 0xad, 0xa4, 0xdb, 0x9f,
+	0xd8, 0x1e, 0x11, 0xcb, 0xd8, 0x08, 0x28, 0xb9, 0x30, 0x6b, 0xd1, 0x02, 0x69, 0x99, 0xa0, 0x2d,
+	0x2b, 0x20, 0x0d, 0x0a, 0xff, 0xc5, 0x17, 0x92, 0x9a, 0x2d, 0x51, 0x3b, 0x9b, 0xa5, 0x5a, 0x17,
+	0x25, 0x4c, 0x8b, 0xa3, 0x32, 0x73, 0x7f, 0x55, 0xff, 0xa2, 0xe8, 0xdf, 0x29, 0x00, 0x0b, 0x09,
+	0x7a, 0x0a, 0xdb, 0xb6, 0x1f, 0xce, 0x03, 0x6a, 0x85, 0x73, 0x7a, 0x1a, 0x7a, 0xc1, 0xa9, 0xe5,
+	0xc7, 0x36, 0x95, 0x5d, 0x0d, 0x09, 0xd9, 0x58, 0x8a, 0x86, 0xb1, 0x4d, 0xd1, 0x63, 0x40, 0x27,
+	0x18, 0xc7, 0x4b, 0xfa, 0xaa, 0xe8, 0x82, 0x4c, 0x92, 0xd3, 0x5e, 0xd8, 0xf7, 0x02, 0x27, 0xf4,
+	0x53, 0xfd, 0x42, 0xd6, 0xfe, 0x40, 0x8a, 0x72, 0xf6, 0xf3, 0xfa, 0xc5, 0x85, 0xfd, 0xac, 0xb6,
+	0xde, 0x84, 0x1d, 0x19, 0xf8, 0x41, 0x10, 0x7b, 0xa7, 0x67, 0x34, 0x69, 0x0b, 0xfa, 0xbf, 0xe0,
+	0xfa, 0x07, 0x12, 0x59, 0x0c, 0x3d, 0xd0, 0x64, 0x0a, 0x2d, 0x4f, 0xca, 0x64, 0x55, 0xa4, 0xdf,
+	0x52, 0xfe, 0xa8, 0xb9, 0xe1, 0xe4, 0x4d, 0xe9, 0xdf, 0xab, 0xd0, 0xc8, 0xeb, 0x7c, 0xec, 0x63,
+	0x62, 0x8f, 0x47, 0xf2, 0x38, 0x58, 0x31, 0x76, 0xc2, 0xc0, 0x8d, 0x65, 0x6d, 0x6b, 0xa9, 0xe0,
+	0x48, 0xe0, 0xac, 0xd6, 0xe6, 0x11, 0x2b, 0xf0, 0x54, 0x53, 0x14, 0x7a, 0x5d, 0xa0, 0x89, 0xda,
+	0x53, 0xd8, 0x3e, 0x0f, 0x67, 0x73, 0x1f, 0xaf, 0x8c, 0x16, 0x12, 0xb2, 0x5c, 0x74, 0x17, 0x27,
+	0xf2, 0xf9, 0x5b, 0xcb, 0x9e, 0xc8, 0x65, 0xb0, 0x0d, 0x3c, 0xea, 0x16, 0xb6, 0x49, 0x80, 0x5d,
+	0xa1, 0x5d, 0xe2, 0xda, 0x0d, 0x86, 0x1b, 0x1c, 0xe6, 0x9a, 0x77, 0xa1, 0xee, 0x84, 0xc1, 0x89,
+	0x47, 0x7c, 0xd9, 0x9f, 0xca, 0x7b, 0x4a, 0xbb, 0x6e, 0xe6, 0x41, 0xd4, 0x84, 0x72, 0x44, 0xbc,
+	0x73, 0x9b, 0xe2, 0x66, 0x85, 0xb7, 0x8d, 0x64, 0xab, 0x7f, 0xab, 0xc0, 0xd6, 0x81, 0x67, 0x53,
+	0x23, 0xa6, 0x9e, 0x6f, 0x53, 0x9c, 0xf4, 0x8b, 0xe7, 0x50, 0x91, 0xcd, 0x3d, 0x49, 0x53, 0x3b,
+	0x49, 0xd3, 0x0a, 0xf5, 0xfd, 0x09, 0xf1, 0x9c, 0x64, 0x63, 0xa6, 0x27, 0x5b, 0xff, 0x86, 0xf5,
+	0xac, 0x04, 0x35, 0x40, 0xf5, 0x5c, 0x99, 0x26, 0xd5, 0x73, 0x59, 0x57, 0x92, 0x95, 0x9a, 0x16,
+	0x74, 0xd1, 0x04, 0x01, 0xf1, 0xeb, 0xed, 0x42, 0x95, 0xc5, 0x3e, 0xa6, 0xb6, 0x1f, 0xc9, 0xfa,
+	0x5d, 0x00, 0xaf, 0x8a, 0x15, 0x55, 0x2b, 0xe8, 0x5f, 0x2b, 0xb0, 0x9d, 0xf7, 0x49, 0x96, 0xdc,
+	0x10, 0x6a, 0x27, 0x9e, 0x4d, 0xc5, 0xd3, 0x92, 0x5c, 0xe3, 0xf1, 0xea, 0x6b, 0x88, 0x23, 0x1c,
+	0xe4, 0x6f, 0x8e, 0x6c, 0x0d, 0x70, 0x92, 0x02, 0xad, 0xbf, 0xc1, 0xc6, 0x92, 0x78, 0x45, 0x63,
+	0xc8, 0xb5, 0xef, 0x6a, 0xb6, 0x09, 0x9c, 0xc3, 0xe6, 0x28, 0x74, 0x97, 0xda, 0x72, 0xbe, 0xeb,
+	0x2a, 0x57, 0x75, 0x5d, 0x35, 0xd7, 0x75, 0xd1, 0x1f, 0x61, 0xdd, 0xf5, 0x62, 0xfb, 0xed, 0x0c,
+	0x5b, 0xcc, 0x47, 0x5e, 0x7e, 0x15, 0xb3, 0x26, 0x31, 0xe6, 0xe8, 0xab, 0x62, 0xa5, 0xa0, 0x15,
+	0xf5, 0xcf, 0x55, 0xa8, 0x09, 0x52, 0xe1, 0x73, 0x2e, 0xa4, 0x92, 0x31, 0x05, 0x18, 0x63, 0x18,
+	0xb0, 0x66, 0xeb, 0x05, 0x9c, 0xb1, 0x62, 0x96, 0xc3, 0xa0, 0xcf, 0xb6, 0x68, 0x07, 0x4a, 0x22,
+	0x33, 0xf2, 0xbb, 0x90, 0x3b, 0x86, 0x3b, 0x04, 0xbb, 0x5e, 0xe2, 0x83, 0xdc, 0xb1, 0x50, 0xd8,
+	0x71, 0x8c, 0x45, 0x9d, 0x57, 0x4d, 0xb1, 0x41, 0xf7, 0xa0, 0x48, 0x2f, 0x22, 0xcc, 0xcb, 0xb9,
+	0xd1, 0xdd, 0x4c, 0xb2, 0xc1, 0x7d, 0x9b, 0x5e, 0x44, 0xd8, 0xe4, 0x62, 0x84, 0xa0, 0x48, 0xff,
+	0xe7, 0xb9, 0xbc, 0x9c, 0xab, 0x26, 0x5f, 0x33, 0x8c, 0x5f, 0xb5, 0x22, 0x30, 0xb6, 0x66, 0xb7,
+	0x21, 0xf8, 0x04, 0x13, 0x1c, 0x38, 0xb8, 0x59, 0x15, 0xdf, 0x7f, 0x0a, 0xb0, 0x13, 0x41, 0x48,
+	0x71, 0x13, 0xc4, 0x09, 0xb6, 0xd6, 0xfb, 0x80, 0xb2, 0x79, 0x90, 0xb5, 0xf2, 0x64, 0xf9, 0xad,
+	0xda, 0x5a, 0x3c, 0x1e, 0x69, 0xec, 0xd2, 0x97, 0xea, 0xe1, 0x67, 0x2a, 0x54, 0x53, 0x97, 0xf3,
+	0x93, 0xe2, 0x0e, 0xa0, 0xc3, 0x71, 0xbf, 0x77, 0x68, 0xf5, 0x5f, 0xf6, 0x46, 0x23, 0xe3, 0xd0,
+	0x1a, 0x4f, 0x8c, 0x91, 0xa6, 0xa0, 0xeb, 0xb0, 0x65, 0x1a, 0xc3, 0xf1, 0xd4, 0xc8, 0x0b, 0x54,
+	0xb4, 0x0d, 0x5a, 0x16, 0xb1, 0x0e, 0x0c, 0x36, 0x42, 0x6e, 0x42, 0x3d, 0x41, 0xfb, 0x87, 0xe3,
+	0x23, 0x36, 0x40, 0xf2, 0xb9, 0xb3, 0x6f, 0x0c, 0x26, 0x53, 0x6d, 0x8d, 0x6d, 0x26, 0xbd, 0x7f,
+	0x0e, 0x8d, 0xd1, 0x54, 0x2b, 0xa1, 0x32, 0x14, 0xd8, 0xa9, 0x32, 0xb7, 0x35, 0x30, 0xfb, 0xc7,
+	0x87, 0x3d, 0xd3, 0x4a, 0x74, 0x2b, 0x4c, 0xf7, 0x60, 0x6c, 0xbe, 0xe9, 0x99, 0xcf, 0xb5, 0x2a,
+	0xda, 0x80, 0x9a, 0xdc, 0x70, 0x26, 0xc8, 0x9d, 0x49, 0x4c, 0xd6, 0xd8, 0xb4, 0x9a, 0xa2, 0x4c,
+	0x6f, 0x1d, 0x55, 0x61, 0xed, 0xe8, 0x8d, 0x61, 0x4c, 0xb4, 0x3a, 0xaa, 0x43, 0x95, 0x2f, 0xb9,
+	0xa4, 0xd1, 0xfd, 0x79, 0x0d, 0xea, 0x07, 0x36, 0xb1, 0x5d, 0xfb, 0xe2, 0x08, 0x93, 0x73, 0x4c,
+	0xd0, 0x97, 0x0a, 0xec, 0xac, 0x9e, 0x6c, 0xd1, 0xbd, 0x24, 0xb0, 0x57, 0x4e, 0xbe, 0xad, 0xbb,
+	0x57, 0x0c, 0x93, 0xe9, 0xab, 0xa2, 0x3f, 0xfb, 0xf4, 0x87, 0x9f, 0xde, 0xab, 0x8f, 0xd0, 0x83,
+	0xce, 0xf9, 0xb3, 0xce, 0x89, 0x70, 0xa1, 0x23, 0x47, 0xda, 0xb8, 0xf3, 0xff, 0xcc, 0x8c, 0xba,
+	0x2f, 0xe6, 0xfb, 0x4f, 0xd0, 0x57, 0x0a, 0x34, 0x2f, 0x1b, 0x6f, 0xd1, 0xfd, 0x84, 0xf5, 0x23,
+	0x03, 0xf0, 0x6f, 0x74, 0xaf, 0xcb, 0xdd, 0x7b, 0x8c, 0x1e, 0x66, 0xdd, 0x4b, 0x87, 0xdb, 0xd5,
+	0xfe, 0x79, 0xcb, 0x33, 0xd0, 0xee, 0xea, 0xa9, 0x49, 0x3a, 0x72, 0xeb, 0x12, 0xa9, 0xf4, 0xe0,
+	0x26, 0xf7, 0xe0, 0x1a, 0xda, 0xca, 0x7a, 0x40, 0x84, 0x2a, 0x8a, 0x60, 0x63, 0xe9, 0xb9, 0x46,
+	0xb7, 0x57, 0x3f, 0xc6, 0xe9, 0xbd, 0xef, 0x5c, 0x2a, 0x97, 0x84, 0xbb, 0x9c, 0x70, 0x07, 0x6d,
+	0x67, 0x09, 0x93, 0x17, 0x1f, 0x39, 0xb0, 0x9e, 0xed, 0xbb, 0xe8, 0xe6, 0x15, 0x8f, 0x4a, 0x6b,
+	0xf7, 0xaa, 0x56, 0xad, 0x37, 0x39, 0x11, 0x42, 0x5a, 0x96, 0x88, 0xf7, 0x04, 0x07, 0x60, 0xf1,
+	0x85, 0xa3, 0x1b, 0x89, 0x95, 0x0f, 0xba, 0x6f, 0xab, 0xb5, 0x4a, 0x24, 0xcd, 0xdf, 0xe6, 0xe6,
+	0x9b, 0x68, 0x27, 0x6b, 0x3e, 0x08, 0xd9, 0xff, 0x01, 0xd3, 0x7b, 0x5b, 0xe2, 0x7f, 0xaf, 0x7f,
+	0xfe, 0x35, 0x00, 0x00, 0xff, 0xff, 0x34, 0xff, 0x13, 0x01, 0xf0, 0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/frdrpc/rpc.proto b/frdrpc/rpc.proto
index b524d04..8fdb670 100644
--- a/frdrpc/rpc.proto
+++ b/frdrpc/rpc.proto
@@ -347,6 +347,12 @@ message NodeReportRequest {
     uint64 end_time = 2;
 
     reserved  3;
+
+    /*
+    Set to generate a report without conversion to fiat. If set, fiat values
+    will display as 0.
+    */
+    bool disable_fiat = 4;
 }
 
 enum EntryType {
diff --git a/frdrpc/rpc.swagger.json b/frdrpc/rpc.swagger.json
index 1176e37..41de57a 100644
--- a/frdrpc/rpc.swagger.json
+++ b/frdrpc/rpc.swagger.json
@@ -94,6 +94,14 @@
             "required": false,
             "type": "string",
             "format": "uint64"
+          },
+          {
+            "name": "disable_fiat",
+            "description": "Set to generate a report without conversion to fiat. If set, fiat values\nwill display as 0.",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "format": "boolean"
           }
         ],
         "tags": [
diff --git a/frdrpc/rpcserver.go b/frdrpc/rpcserver.go
index e700ecc..a6f7485 100644
--- a/frdrpc/rpcserver.go
+++ b/frdrpc/rpcserver.go
@@ -16,12 +16,10 @@ import (
 	"net/http"
 	"sync"
 	"sync/atomic"
-	"time"
 
 	proxy "github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/lightninglabs/faraday/accounting"
 	"github.com/lightninglabs/faraday/fiat"
-	"github.com/lightninglabs/faraday/paginater"
 	"github.com/lightninglabs/faraday/recommend"
 	"github.com/lightninglabs/faraday/revenue"
 	"github.com/lightninglabs/lndclient"
@@ -106,139 +104,6 @@ type Config struct {
 	CORSOrigin string
 }
 
-// wrapListChannels wraps the listchannels call to lnd, with a publicOnly bool
-// that can be used to toggle whether private channels are included.
-func (c *Config) wrapListChannels(ctx context.Context,
-	publicOnly bool) func() ([]lndclient.ChannelInfo, error) {
-
-	return func() ([]lndclient.ChannelInfo, error) {
-		resp, err := c.Lnd.Client.ListChannels(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		// If we want all channels, we can just return now.
-		if !publicOnly {
-			return resp, err
-		}
-
-		// If we only want public channels, we skip over all private
-		// channels and return a list of public only.
-		var publicChannels []lndclient.ChannelInfo
-		for _, channel := range resp {
-			if channel.Private {
-				continue
-			}
-
-			publicChannels = append(publicChannels, channel)
-		}
-
-		return publicChannels, nil
-	}
-}
-
-// wrapListInvoices makes paginated calls to lnd to get our full set of
-// invoices.
-func (c *Config) wrapListInvoices(ctx context.Context) ([]lndclient.Invoice, error) {
-	var invoices []lndclient.Invoice
-
-	query := func(offset, maxInvoices uint64) (uint64, uint64, error) {
-		resp, err := c.Lnd.Client.ListInvoices(
-			ctx, lndclient.ListInvoicesRequest{
-				Offset:      offset,
-				MaxInvoices: maxInvoices,
-			},
-		)
-		if err != nil {
-			return 0, 0, err
-		}
-
-		invoices = append(invoices, resp.Invoices...)
-
-		return resp.LastIndexOffset, uint64(len(resp.Invoices)), nil
-	}
-
-	// Make paginated calls to the invoices API, starting at offset 0 and
-	// querying our max number of invoices each time.
-	if err := paginater.QueryPaginated(
-		ctx, query, 0, uint64(maxInvoiceQueries),
-	); err != nil {
-		return nil, err
-	}
-
-	return invoices, nil
-}
-
-// wrapListPayments makes a set of paginated calls to lnd to get our full set
-// of payments.
-func (c *Config) wrapListPayments(ctx context.Context) ([]lndclient.Payment,
-	error) {
-
-	var payments []lndclient.Payment
-
-	query := func(offset, maxEvents uint64) (uint64, uint64, error) {
-		resp, err := c.Lnd.Client.ListPayments(
-			ctx, lndclient.ListPaymentsRequest{
-				Offset:      offset,
-				MaxPayments: maxEvents,
-			},
-		)
-		if err != nil {
-			return 0, 0, err
-		}
-
-		payments = append(payments, resp.Payments...)
-
-		return resp.LastIndexOffset, uint64(len(resp.Payments)), nil
-	}
-
-	// Make paginated calls to the payments API, starting at offset 0 and
-	// querying our max number of payments each time.
-	if err := paginater.QueryPaginated(
-		ctx, query, 0, uint64(maxPaymentQueries),
-	); err != nil {
-		return nil, err
-	}
-
-	return payments, nil
-}
-
-// wrapListForwards makes paginated calls to our forwarding events api.
-func (c *Config) wrapListForwards(ctx context.Context, startTime,
-	endTime time.Time) ([]lndclient.ForwardingEvent, error) {
-
-	var forwards []lndclient.ForwardingEvent
-
-	query := func(offset, maxEvents uint64) (uint64, uint64, error) {
-		resp, err := c.Lnd.Client.ForwardingHistory(
-			ctx, lndclient.ForwardingHistoryRequest{
-				StartTime: startTime,
-				EndTime:   endTime,
-				Offset:    uint32(offset),
-				MaxEvents: uint32(maxEvents),
-			},
-		)
-		if err != nil {
-			return 0, 0, err
-		}
-
-		forwards = append(forwards, resp.Events...)
-
-		return uint64(resp.LastIndexOffset),
-			uint64(len(resp.Events)), nil
-	}
-
-	// Make paginated calls to the forwards API, starting at offset 0 and
-	// querying our max number of payments each time.
-	if err := paginater.QueryPaginated(
-		ctx, query, 0, uint64(maxForwardQueries),
-	); err != nil {
-		return nil, err
-	}
-
-	return forwards, nil
-}
-
 // NewRPCServer returns a server which will listen for rpc requests on the
 // rpc listen address provided. Note that the server returned is not running,
 // and should be started using Start().
diff --git a/lndwrap/lndwrap.go b/lndwrap/lndwrap.go
new file mode 100644
index 0000000..1e917c1
--- /dev/null
+++ b/lndwrap/lndwrap.go
@@ -0,0 +1,148 @@
+// Package lndwrap wraps various calls to lndclient for convenience. It offers
+// wrapping for paginated queries that will obtain all entries from a desired
+// index onwards.
+package lndwrap
+
+import (
+	"context"
+	"time"
+
+	"github.com/lightninglabs/faraday/paginater"
+	"github.com/lightninglabs/lndclient"
+)
+
+// ListInvoices makes paginated calls to lnd to get our full set of
+// invoices.
+func ListInvoices(ctx context.Context, startOffset, maxInvoices uint64,
+	lnd lndclient.LightningClient) ([]lndclient.Invoice, error) {
+
+	var invoices []lndclient.Invoice
+
+	query := func(offset, maxInvoices uint64) (uint64, uint64, error) {
+		resp, err := lnd.ListInvoices(
+			ctx, lndclient.ListInvoicesRequest{
+				Offset:      offset,
+				MaxInvoices: maxInvoices,
+			},
+		)
+		if err != nil {
+			return 0, 0, err
+		}
+
+		invoices = append(invoices, resp.Invoices...)
+
+		return resp.LastIndexOffset, uint64(len(resp.Invoices)), nil
+	}
+
+	// Make paginated calls to the invoices API, starting at offset 0 and
+	// querying our max number of invoices each time.
+	if err := paginater.QueryPaginated(
+		ctx, query, startOffset, maxInvoices,
+	); err != nil {
+		return nil, err
+	}
+
+	return invoices, nil
+}
+
+// ListPayments makes a set of paginated calls to lnd to get our full set
+// of payments.
+func ListPayments(ctx context.Context, startOffset, maxPayments uint64,
+	lnd lndclient.LightningClient) ([]lndclient.Payment, error) {
+
+	var payments []lndclient.Payment
+
+	query := func(offset, maxEvents uint64) (uint64, uint64, error) {
+		resp, err := lnd.ListPayments(
+			ctx, lndclient.ListPaymentsRequest{
+				Offset:      offset,
+				MaxPayments: maxEvents,
+			},
+		)
+		if err != nil {
+			return 0, 0, err
+		}
+
+		payments = append(payments, resp.Payments...)
+
+		return resp.LastIndexOffset, uint64(len(resp.Payments)), nil
+	}
+
+	// Make paginated calls to the payments API, starting at offset 0 and
+	// querying our max number of payments each time.
+	if err := paginater.QueryPaginated(
+		ctx, query, startOffset, maxPayments,
+	); err != nil {
+		return nil, err
+	}
+
+	return payments, nil
+}
+
+// ListForwards makes paginated calls to our forwarding events api.
+func ListForwards(ctx context.Context, maxForwards uint64, startTime,
+	endTime time.Time, lnd lndclient.LightningClient) (
+	[]lndclient.ForwardingEvent, error) {
+
+	var forwards []lndclient.ForwardingEvent
+
+	query := func(offset, maxEvents uint64) (uint64, uint64, error) {
+		resp, err := lnd.ForwardingHistory(
+			ctx, lndclient.ForwardingHistoryRequest{
+				StartTime: startTime,
+				EndTime:   endTime,
+				Offset:    uint32(offset),
+				MaxEvents: uint32(maxEvents),
+			},
+		)
+		if err != nil {
+			return 0, 0, err
+		}
+
+		forwards = append(forwards, resp.Events...)
+
+		return uint64(resp.LastIndexOffset),
+			uint64(len(resp.Events)), nil
+	}
+
+	// Make paginated calls to the forwards API, starting at offset 0 and
+	// querying our max number of payments each time.
+	if err := paginater.QueryPaginated(
+		ctx, query, 0, maxForwards,
+	); err != nil {
+		return nil, err
+	}
+
+	return forwards, nil
+}
+
+// ListChannels wraps the listchannels call to lnd, with a publicOnly bool
+// that can be used to toggle whether private channels are included.
+func ListChannels(ctx context.Context, lnd lndclient.LightningClient,
+	publicOnly bool) func() ([]lndclient.ChannelInfo, error) {
+
+	return func() ([]lndclient.ChannelInfo, error) {
+		resp, err := lnd.ListChannels(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		// If we want all channels, we can just return now.
+		if !publicOnly {
+			return resp, err
+		}
+
+		// If we only want public channels, we skip over all private
+		// channels and return a list of public only.
+		var publicChannels []lndclient.ChannelInfo
+		for _, channel := range resp {
+			if channel.Private {
+				continue
+			}
+
+			publicChannels = append(publicChannels, channel)
+		}
+
+		return publicChannels, nil
+	}
+}