diff --git a/Config.cpp b/Config.cpp
index d33905b19..f058ecb75 100644
--- a/Config.cpp
+++ b/Config.cpp
@@ -10,7 +10,6 @@ Config theConfig;
 Config::Config()
 {
 	VERSION=1;
-	TEST_NET=false;
 
 	NETWORK_START_TIME=1319844908;
 
@@ -22,23 +21,12 @@ Config::Config()
 	// a new ledger every 30 min
 	LEDGER_SECONDS=(60*30); 
 
-	// length of delay between start finalization and sending your first proposal
-	// This delay allows us to collect a few extra transactions from people who's clock is different than ours
-	// It should increase the chance that the ledgers will all hash the same
-	LEDGER_PROPOSAL_DELAY_SECONDS=30; 
-
-	// How long to wait between proposal send and ledger close. 
-	// at which point you publish your validation
-	// You are only waiting to get extra transactions from your peers 
-	LEDGER_FINALIZATION_SECONDS=(60*5); 
 	RPC_USER="admin";
 	RPC_PASSWORD="pass";
 
 	DATA_DIR="";
 
-	TRANSACTION_FEE=1000;
-	ACCOUNT_FEE=1000;
-	MIN_VOTES_FOR_CONSENSUS=1;
+	TRANSACTION_FEE_BASE=1000;
 }
 
 void Config::load()
@@ -62,4 +50,4 @@ void Config::load()
 		else theApp->setSerializer(new DiskSerializer());
 	}else */
 
-}
\ No newline at end of file
+}
diff --git a/Config.h b/Config.h
index 3e0186e37..44bfcdb92 100644
--- a/Config.h
+++ b/Config.h
@@ -3,34 +3,41 @@
 class Config
 {
 public:
+
+	// core software parameters
 	int VERSION;
 	std::string VERSION_STR;
-	bool TEST_NET;
-	int NETWORK_START_TIME;  // The Unix time we start ledger 0
 
-	int TRANSACTION_FEE;
-	int ACCOUNT_FEE;
-	int PEER_PORT;
-	int RPC_PORT;
-	int NUMBER_CONNECTIONS;
+	// network parameters
+	std::string NETWORK_ID;
+	std::string NETWORK_DNS_SEEDS;
+	int NETWORK_START_TIME;  // The Unix time we start ledger 0
+	int TRANSACTION_FEE_BASE;
 	int LEDGER_SECONDS;
 	int LEDGER_PROPOSAL_DELAY_SECONDS;
-	int LEDGER_FINALIZATION_SECONDS;
-	std::string RECEIVE_ACTION;
+	int LEDGER_AVALANCHE_SECONDS;
 	int BELIEF_QUORUM;
 	float BELIEF_PERCENT;
+
+	// node networking parameters
+	int PEER_PORT;
+	int NUMBER_CONNECTIONS;
+	bool NODE_INBOUND;		// we accept inbound connections
+	bool NODE_DATABASE;		// we offer historical data services
+	bool NODE_PUBLIC;		// we do not attempt to hide our identity
+	bool NODE_DUMB;			// we are a 'dumb' client
+	bool NODE_SMART;		// we offer services to 'dumb' clients
+
+	std::string HANKO_PRIVATE;
+
+	// RPC parameters
+	int RPC_PORT;
 	std::string RPC_USER;
 	std::string RPC_PASSWORD;
-	std::string HANKO;
 
+	// configuration parameters
 	std::string DATA_DIR;
 
-	int MIN_VOTES_FOR_CONSENSUS;
-
-
-
-
-
 	Config();
 
 	void load();