diff --git a/src/LedgerFormats.cpp b/src/LedgerFormats.cpp
new file mode 100644
index 000000000..89f6b34b0
--- /dev/null
+++ b/src/LedgerFormats.cpp
@@ -0,0 +1,57 @@
+
+#include "LedgerFormats.h"
+
+#define S_FIELD(x) sf##x, #x
+
+LedgerEntryFormat LedgerFormats[]=
+{
+	{ "AccountRoot", ltACCOUNT_ROOT, {
+		{ S_FIELD(Flags),        STI_UINT16,  SOE_FLAGS,    0 },
+		{ S_FIELD(Account),      STI_ACCOUNT, SOE_REQUIRED, 0 },
+		{ S_FIELD(Sequence),     STI_UINT32,  SOE_REQUIRED, 0 },
+		{ S_FIELD(Balance),      STI_UINT64,  SOE_REQUIRED, 0 },
+		{ S_FIELD(LastReceive),  STI_UINT32,  SOE_REQUIRED, 0 },
+		{ S_FIELD(LastTxn),      STI_UINT32,  SOE_REQUIRED, 0 },
+		{ S_FIELD(EmailHash),    STI_HASH128, SOE_IFFLAG,   1 },
+		{ S_FIELD(WalletLocator),STI_HASH256, SOE_IFFLAG,   2 },
+		{ S_FIELD(MessageKey),   STI_VL,      SOE_IFFLAG,   4 },
+		{ S_FIELD(Extensions),   STI_TL,      SOE_IFFLAG,   32768 },
+		{ sfInvalid, NULL,       STI_DONE,    SOE_NEVER,    -1 } }
+	},
+	{ "RippleState", ltRIPPLE_STATE, {
+		{ S_FIELD(Flags),        STI_UINT16,  SOE_FLAGS,    0 },
+		{ S_FIELD(Borrower),     STI_ACCOUNT, SOE_REQUIRED, 0 },
+		{ S_FIELD(Lender),       STI_ACCOUNT, SOE_REQUIRED, 0 },
+		{ S_FIELD(Currency),     STI_HASH160, SOE_IFFLAG,   1 },
+		{ S_FIELD(Limit),        STI_UINT64,  SOE_REQUIRED, 0 },
+		{ S_FIELD(Balance),      STI_UINT64,  SOE_REQUIRED, 0 },
+		{ S_FIELD(CurrentRate),  STI_UINT32,  SOE_IFFLAG,   2 },
+		{ S_FIELD(RateLock),     STI_UINT32,  SOE_IFFLAG,   4 },
+		{ S_FIELD(NextRate),     STI_UINT32,  SOE_IFFLAG,   8 },
+		{ S_FIELD(NextRateLgr),  STI_UINT32,  SOE_IFFLAG,   8 },
+		{ S_FIELD(NextRateExp),  STI_UINT32,  SOE_IFFLAG,   16 },
+		{ S_FIELD(Extensions),   STI_TL,      SOE_IFFLAG,   32768 },
+		{ sfInvalid, NULL,       STI_DONE,    SOE_NEVER,    -1 } }
+	},
+	{ "Nickname", ltNICKNAME, {
+		{ S_FIELD(Flags),        STI_UINT16,  SOE_FLAGS,    0 },
+		{ S_FIELD(Nickname),     STI_HASH256, SOE_REQUIRED, 0 },
+		{ S_FIELD(Account),      STI_ACCOUNT, SOE_REQUIRED, 0 },
+		{ S_FIELD(MinimumOffer), STI_UINT64,  SOE_IFFLAG,   1 },
+		{ S_FIELD(OfferCurrency),STI_HASH160, SOE_IFFLAG,   2 },
+		{ S_FIELD(Extensions),   STI_TL,      SOE_IFFLAG,   32768 },
+		{ sfInvalid, NULL,       STI_DONE,    SOE_NEVER,    -1 } }
+	},
+	{ NULL, ltINVALID }
+};
+
+LedgerEntryFormat* getLgrFormat(LedgerEntryType t)
+{
+	LedgerEntryFormat* f=LedgerFormats;
+	while(f->t_name!=NULL)
+	{
+		if(f->t_type==t) return f;
+		f++;
+	}
+	return NULL;
+}
diff --git a/src/LedgerFormats.h b/src/LedgerFormats.h
new file mode 100644
index 000000000..ba2a379d5
--- /dev/null
+++ b/src/LedgerFormats.h
@@ -0,0 +1,23 @@
+#ifndef __LEDGERFORMATS__
+#define __LEDGERFORMATS__
+
+#include "SerializedObject.h"
+
+enum LedgerEntryType
+{
+	ltINVALID=-1,
+	ltACCOUNT_ROOT=0,
+	ltRIPPLE_STATE=1,
+	ltNICKNAME=2
+};
+
+struct LedgerEntryFormat
+{
+	const char *t_name;
+	LedgerEntryType t_type;
+	SOElement elements[16];
+};
+
+extern LedgerEntryFormat LedgerFormats[];
+extern LedgerEntryFormat* getLgrFormat(LedgerEntryType t);
+#endif
diff --git a/src/SerializedObject.h b/src/SerializedObject.h
index 10f4585b7..f1e53ad14 100644
--- a/src/SerializedObject.h
+++ b/src/SerializedObject.h
@@ -23,8 +23,11 @@ enum SOE_Field
 	sfFlags, sfExtensions, sfTargetLedger, sfSourceTag, sfIdentifier,
 	sfDestination, sfTarget, sfAmount, sfCurrency,
 	sfAmountIn, sfAmountOut, sfCurrencyIn, sfCurrencyOut,
-	sfInvoiceID,
-	sfExpireLedger
+	sfInvoiceID, sfExpireLedger, sfMessageKey, sfCurrentRate, sfRateLock,
+	sfAccount, sfSequence, sfBalance, sfWalletLocator, sfEmailHash,
+	sfBorrower, sfLendfer, sfLimit, sfOfferCurrency,
+	sfLastReceive, sfLastTxn, sfLender, sfNextRate, sfNextRateLgr, sfNextRateExp,
+	sfNickname, sfMinimumOffer
 };
 
 struct SOElement