diff --git a/xcat/cli.py b/xcat/cli.py
index d6e5e6c..2544c86 100644
--- a/xcat/cli.py
+++ b/xcat/cli.py
@@ -177,8 +177,8 @@ def main():
     parser.add_argument("command", action="store", help="list commands")
     parser.add_argument("arguments", action="store", nargs="*", help="add arguments")
     parser.add_argument("-w", "--wormhole", action="store_true", help="Transfer trade data through magic-wormhole")
-    parser.add_argument("-n", "--network", action="store", help="Set network to regtest or mainnet. Defaults to testnet while in beta.")
     parser.add_argument("-c", "--conf", action="store", help="Use default trade data in conf file.")
+    parser.add_argument("-n", "--network", action="store", help="Set network to regtest or mainnet. Defaults to testnet while in beta.")
     # parser.add_argument("--daemon", "-d", action="store_true", help="Run as daemon process")
     # TODO: function to view available trades
     # TODO: function to tell if tradeid already exists for newtrade
@@ -189,8 +189,7 @@ def main():
         if args.wormhole:
             wormhole_importtrade()
         else:
-            if len(args.arguments) != 2:
-                throw("Usage: importtrade [tradeid] [hexstring]")
+            if len(args.arguments) != 2: throw("Usage: importtrade [tradeid] [hexstring]")
             tradeid = args.arguments[0]
             hexstr = args.arguments[1]
             importtrade(tradeid, hexstr)
@@ -205,8 +204,7 @@ def main():
         tradeid = args.arguments[0]
         checktrade(tradeid)
     elif command == 'newtrade':
-        if len(args.arguments) < 1:
-            throw("Usage: newtrade [tradeid]")
+        if len(args.arguments) < 1: throw("Usage: newtrade [tradeid]")
         tradeid = args.arguments[0]
         print("network, conf", args.network, args.conf)
         newtrade(tradeid, network=args.network, conf=args.conf)
@@ -218,7 +216,6 @@ def main():
         tradeid = args.arguments[0]
         checkSellStatus(tradeid)
     elif command == "step2":
-        # trade = get_trade()
         tradeid = args.arguments[0]
         checkBuyStatus(tradeid)
     elif command == "step3":
diff --git a/xcat/protocol.py b/xcat/protocol.py
index 69b9fbf..c9b946a 100644
--- a/xcat/protocol.py
+++ b/xcat/protocol.py
@@ -168,13 +168,13 @@ def buyer_fulfill(trade):
     print_trade('buyer')
 
 def seller_init(tradeid, **kwargs):
-    print(*kwargs)
-    if kwargs['network'] == 'regtest':
-        init_addrs = REGTEST_INIT_ADDRS
-        fulfill_addrs = REGTEST_FULFILL_ADDRS
-    elif kwargs['network'] == 'testnet':
-        init_addrs = TESTNET_INIT_ADDRS
-        fulfill_addrs = TESTNET_FULFILL_ADDRS
+    conf = kwargs['conf']
+    if conf.upper() == 'REGTEST':
+        init_addrs = REGTEST['initiator']
+        fulfill_addrs = REGTEST['fulfiller']
+    elif conf.upper() == 'TESTNET':
+        init_addrs = TESTNET['initiator']
+        fulfill_addrs = TESTNET['fulfiller']
     else:
         init_addrs = userInput.get_initiator_addresses()
         fulfill_addrs = userInput.get_fulfiller_addresses()
diff --git a/xcatconf.py b/xcatconf.py
index 91b2817..4035d54 100644
--- a/xcatconf.py
+++ b/xcatconf.py
@@ -1,5 +1,22 @@
-
-
 # Replace with your own addresses
-REGTEST_INIT_ADDRS = {"bitcoin": "mvc56qCEVj6p57xZ5URNC3v7qbatudHQ9b", "zcash": "tmTF7LMLjvEsGdcepWPUsh4vgJNrKMWwEyc"}
-REGTEST_FULFILL_ADDRS = {"bitcoin": "moRt56gJQGDNK46Y6fYy2HbooKnQXrTGDN", "zcash": "tmK3rGzHDqa78MCwEicx9VcY9ZWX9gCF2nd"}
+REGTEST = {
+    "initiator": {
+        "bitcoin": "mvc56qCEVj6p57xZ5URNC3v7qbatudHQ9b",
+        "zcash": "tmTF7LMLjvEsGdcepWPUsh4vgJNrKMWwEyc"
+    },
+    "fulfiller": {
+        "bitcoin": "moRt56gJQGDNK46Y6fYy2HbooKnQXrTGDN",
+        "zcash": "tmK3rGzHDqa78MCwEicx9VcY9ZWX9gCF2nd"
+    }
+}
+
+TESTNET = {
+    "initiator": {
+        "bitcoin": "mvc56qCEVj6p57xZ5URNC3v7qbatudHQ9b",
+        "zcash": "tmTF7LMLjvEsGdcepWPUsh4vgJNrKMWwEyc"
+    },
+    "fulfiller": {
+        "bitcoin": "mgRG44X4PQC1ZCA4V654UZjJGJ3pxbApj2",
+        "zcash": "tmLZu7MdjNdA6vbPTNTwdsZo91LnnrVTYB5"
+    }
+}