killbill-aplcache

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 0e574ab..e0ce11c 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -20,8 +20,6 @@
     <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="REPORT_VARIABLES" value="true" />
       <option name="REPORT_PARAMETERS" value="true" />
-      <option name="REPORT_CATCH_PARAMETERS" value="true" />
-      <option name="REPORT_FOREACH_PARAMETERS" value="true" />
     </inspection_tool>
     <inspection_tool class="MagicNumber" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 21e6df3..7d9bd7c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -7,6 +7,7 @@
       <module fileurl="file://$PROJECT_DIR$/beatrix/killbill-beatrix.iml" filepath="$PROJECT_DIR$/beatrix/killbill-beatrix.iml" />
       <module fileurl="file://$PROJECT_DIR$/catalog/killbill-catalog.iml" filepath="$PROJECT_DIR$/catalog/killbill-catalog.iml" />
       <module fileurl="file://$PROJECT_DIR$/currency/killbill-currency.iml" filepath="$PROJECT_DIR$/currency/killbill-currency.iml" />
+      <module fileurl="file://$PROJECT_DIR$/currency/killbill-currency.iml" filepath="$PROJECT_DIR$/currency/killbill-currency.iml" />
       <module fileurl="file://$PROJECT_DIR$/entitlement/killbill-entitlement.iml" filepath="$PROJECT_DIR$/entitlement/killbill-entitlement.iml" />
       <module fileurl="file://$PROJECT_DIR$/api/killbill-internal-api.iml" filepath="$PROJECT_DIR$/api/killbill-internal-api.iml" />
       <module fileurl="file://$PROJECT_DIR$/invoice/killbill-invoice.iml" filepath="$PROJECT_DIR$/invoice/killbill-invoice.iml" />

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 70e36ca..d5be25b 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -224,9 +224,9 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${project.version}.jar" />
+                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${project.version}.jar"></copy>
                             </tasks>
                         </configuration>
                     </execution>

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestBundleTransfer.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestBundleTransfer.java
index 5323585..ec7a677 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestBundleTransfer.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestBundleTransfer.java
@@ -72,7 +72,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
         assertNotNull(bpEntitlement);
 
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvent(NextEvent.PHASE);
@@ -123,7 +123,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
         assertListenerStatus();
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvent(NextEvent.PHASE);
@@ -182,7 +182,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
         assertListenerStatus();
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvent(NextEvent.PHASE);

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
index 4c51694..d3e7445 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
@@ -503,7 +503,7 @@ public class TestIntegration extends TestIntegrationBase {
         //
         DefaultSubscriptionBase subscription = (DefaultSubscriptionBase) baseEntitlement.getSubscriptionBase();
         final DateTime startDate = subscription.getCurrentPhaseStart();
-        final BigDecimal rate = subscription.getCurrentPhase().getFixedPrice().getPrice(Currency.USD);
+        final BigDecimal rate = subscription.getCurrentPhase().getFixed().getPrice().getPrice(Currency.USD);
         verifyTestResult(accountId, subscription.getId(), startDate, null, rate, clock.getUTCNow(), 1);
 
         //

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
index 58e0dbd..bc1f0f4 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
@@ -398,7 +398,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
 
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -416,7 +416,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
         //
         bpEntitlement = changeEntitlementAndCheckForCompletion(bpEntitlement, productName, BillingPeriod.MONTHLY, BillingActionPolicy.IMMEDIATE, NextEvent.CHANGE, NextEvent.INVOICE, NextEvent.INVOICE_ADJUSTMENT);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         invoices = invoiceUserApi.getInvoicesByAccount(account.getId(), callContext);
         assertEquals(invoices.size(), 3);
@@ -504,7 +504,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
         assertNotNull(bpEntitlement);
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -580,7 +580,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
         assertNotNull(bpEntitlement);
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationWithDifferentBillingPeriods.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationWithDifferentBillingPeriods.java
index 491d18d..74bfe42 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationWithDifferentBillingPeriods.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationWithDifferentBillingPeriods.java
@@ -62,7 +62,7 @@ public class TestIntegrationWithDifferentBillingPeriods extends TestIntegrationB
         assertNotNull(bpEntitlement);
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -117,7 +117,7 @@ public class TestIntegrationWithDifferentBillingPeriods extends TestIntegrationB
         assertNotNull(bpEntitlement);
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -186,7 +186,7 @@ public class TestIntegrationWithDifferentBillingPeriods extends TestIntegrationB
         assertNotNull(bpEntitlement);
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -256,7 +256,7 @@ public class TestIntegrationWithDifferentBillingPeriods extends TestIntegrationB
         assertNotNull(bpEntitlement);
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java
index d26e5b9..da39b52 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java
@@ -62,7 +62,7 @@ public class TestSubscription extends TestIntegrationBase {
         assertNotNull(bpEntitlement);
         assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
 
-        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(bpEntitlement.getSubscriptionBase().getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         // Move out of trials for interesting invoices adjustments
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);

diff --git a/beatrix/src/test/resources/catalogSample.xml b/beatrix/src/test/resources/catalogSample.xml
index e7e47d2..34cf332 100644
--- a/beatrix/src/test/resources/catalogSample.xml
+++ b/beatrix/src/test/resources/catalogSample.xml
@@ -171,36 +171,40 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>6</number>
                     </duration>
-                    <billingPeriod>MONTHLY</billingPeriod>
-                    <recurringPrice>
-                        <price>
-                            <currency>USD</currency>
-                            <value>9.95</value>
-                        </price>
-                        <price>
-                            <currency>EUR</currency>
-                            <value>9.95</value>
-                        </price>
-                        <price>
-                            <currency>GBP</currency>
-                            <value>9.95</value>
-                        </price>
-                    </recurringPrice>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>9.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>9.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>9.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -216,6 +220,7 @@
                         <value>29.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
 
@@ -227,15 +232,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -251,6 +258,7 @@
                         <value>29.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="shotgun-monthly">
@@ -261,9 +269,10 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice></fixedPrice>
-                    <!-- no price implies $0 -->
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
@@ -271,6 +280,7 @@
                     <unit>UNLIMITED</unit>
                     <number>-1</number>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -286,6 +296,7 @@
                         <value>169.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="assault-rifle-monthly">
@@ -296,15 +307,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -320,6 +333,7 @@
                         <value>399.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="pistol-quarterly">
@@ -330,15 +344,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>QUARTERLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -354,6 +370,7 @@
                         <value>69.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="pistol-annual">
@@ -364,15 +381,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+<recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -388,6 +407,7 @@
                         <value>199.95</value>
                     </price>
                 </recurringPrice>
+</recurring>
             </finalPhase>
         </plan>
         <plan name="shotgun-annual">
@@ -398,15 +418,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -422,6 +444,7 @@
                         <value>1699.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="assault-rifle-annual">
@@ -432,15 +455,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -456,6 +481,7 @@
                         <value>3999.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="pistol-annual-gunclub-discount">
@@ -466,15 +492,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>6</number>
                     </duration>
+                    <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
@@ -490,12 +518,14 @@
                             <value>9.95</value>
                         </price>
                     </recurringPrice>
+                    </recurring>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -511,6 +541,7 @@
                         <value>199.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="shotgun-annual-gunclub-discount">
@@ -521,15 +552,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>6</number>
                     </duration>
+                    <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
@@ -545,12 +578,14 @@
                             <value>69.95</value>
                         </price>
                     </recurringPrice>
+                    </recurring>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -566,6 +601,7 @@
                         <value>1699.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="assault-rifle-annual-gunclub-discount">
@@ -576,15 +612,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>6</number>
                     </duration>
+                    <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
@@ -600,12 +638,14 @@
                             <value>99.95</value>
                         </price>
                     </recurringPrice>
+                    </recurring>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -621,6 +661,7 @@
                         <value>3999.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="laser-scope-monthly">
@@ -631,6 +672,7 @@
                         <unit>MONTHS</unit>
                         <number>1</number>
                     </duration>
+                    <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
@@ -646,12 +688,14 @@
                             <value>999.95</value>
                         </price>
                     </recurringPrice>
+                    </recurring>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -667,6 +711,7 @@
                         <value>1999.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="telescopic-scope-monthly">
@@ -677,6 +722,7 @@
                         <unit>MONTHS</unit>
                         <number>1</number>
                     </duration>
+                    <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
@@ -692,12 +738,14 @@
                             <value>399.95</value>
                         </price>
                     </recurringPrice>
+                    </recurring>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -713,6 +761,7 @@
                         <value>999.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="extra-ammo-monthly">
@@ -721,6 +770,7 @@
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -736,6 +786,7 @@
                         <value>999.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
             <plansAllowedInBundle>-1</plansAllowedInBundle>
             <!-- arbitrary number of these (multipack) -->
@@ -748,15 +799,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -772,6 +825,7 @@
                         <value>199.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="holster-monthly-special">
@@ -782,15 +836,17 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice>
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice>
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -806,6 +862,7 @@
                         <value>199.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="assault-rifle-annual-rescue">
@@ -816,6 +873,7 @@
                         <unit>YEARS</unit>
                         <number>1</number>
                     </duration>
+                    <recurring>
                     <billingPeriod>ANNUAL</billingPeriod>
                     <recurringPrice>
                         <price>
@@ -831,12 +889,14 @@
                             <value>3999.95</value>
                         </price>
                     </recurringPrice>
+                    </recurring>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
+                <recurring>
                 <billingPeriod>ANNUAL</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -852,6 +912,7 @@
                         <value>3999.95</value>
                     </price>
                 </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="refurbish-maintenance">
@@ -861,6 +922,23 @@
                     <unit>MONTHS</unit>
                     <number>12</number>
                 </duration>
+                <fixed>
+                    <fixedPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>599.95</value>
+                        </price>
+                    </fixedPrice>
+                </fixed>
+                <recurring>
                 <billingPeriod>MONTHLY</billingPeriod>
                 <recurringPrice>
                     <price>
@@ -876,20 +954,7 @@
                         <value>199.95</value>
                     </price>
                 </recurringPrice>
-                <fixedPrice>
-                    <price>
-                        <currency>USD</currency>
-                        <value>599.95</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>599.95</value>
-                    </price>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>599.95</value>
-                    </price>
-                </fixedPrice>
+                </recurring>
             </finalPhase>
         </plan>
     </plans>

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultFixed.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultFixed.java
new file mode 100644
index 0000000..3d1b237
--- /dev/null
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultFixed.java
@@ -0,0 +1,65 @@
+package org.killbill.billing.catalog;
+
+import java.net.URI;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+import org.killbill.billing.catalog.api.Fixed;
+import org.killbill.billing.catalog.api.FixedType;
+import org.killbill.billing.catalog.api.InternationalPrice;
+import org.killbill.billing.catalog.api.PlanPhase;
+import org.killbill.billing.util.config.catalog.ValidatingConfig;
+import org.killbill.billing.util.config.catalog.ValidationErrors;
+
+@XmlAccessorType(XmlAccessType.NONE)
+public class DefaultFixed extends ValidatingConfig<StandaloneCatalog> implements Fixed {
+
+    @XmlAttribute(required = false)
+    private FixedType type = FixedType.ONE_TIME;
+
+    @XmlElement(required = false)
+    private DefaultInternationalPrice fixedPrice;
+
+    // Not exposed in xml.
+    private PlanPhase phase;
+
+    @Override
+    public FixedType getType() {
+        return type;
+    }
+
+    @Override
+    public InternationalPrice getPrice() {
+        return fixedPrice;
+    }
+
+
+    @Override
+    public void initialize(final StandaloneCatalog root, final URI uri) {
+        if (fixedPrice != null) {
+            fixedPrice.initialize(root, uri);
+        }
+    }
+        @Override
+    public ValidationErrors validate(final StandaloneCatalog root, final ValidationErrors errors) {
+        return errors;
+    }
+
+    protected DefaultFixed setType(final FixedType type) {
+        this.type = type;
+        return this;
+    }
+
+    protected DefaultFixed setFixedPrice(final DefaultInternationalPrice fixedPrice) {
+        this.fixedPrice = fixedPrice;
+        return this;
+    }
+
+    protected DefaultFixed setPhase(final PlanPhase phase) {
+        this.phase = phase;
+        return this;
+    }
+}

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java
index 85c7fa5..1c48937 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java
@@ -39,6 +39,7 @@ import org.killbill.billing.catalog.api.PhaseType;
 import org.killbill.billing.catalog.api.Plan;
 import org.killbill.billing.catalog.api.PlanPhase;
 import org.killbill.billing.catalog.api.Product;
+import org.killbill.billing.catalog.api.Recurring;
 import org.killbill.billing.util.config.catalog.ValidatingConfig;
 import org.killbill.billing.util.config.catalog.ValidationError;
 import org.killbill.billing.util.config.catalog.ValidationErrors;
@@ -142,8 +143,8 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements 
     }
 
     @Override
-    public BillingPeriod getBillingPeriod() {
-        return finalPhase.getBillingPeriod();
+    public BillingPeriod getRecurringBillingPeriod() {
+        return finalPhase.getRecurring() != null ? finalPhase.getRecurring().getBillingPeriod() : BillingPeriod.NO_BILLING_PERIOD;
     }
 
     /* (non-Javadoc)
@@ -246,7 +247,8 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements 
                     skipPhase = false;
                 }
             }
-            if (phase.getRecurringPrice() == null || phase.getRecurringPrice().isZero()) {
+            final Recurring recurring = phase.getRecurring();
+            if (recurring == null || recurring.getRecurringPrice() == null || recurring.getRecurringPrice().isZero()) {
                 result = phase.getDuration().addToDateTime(result);
             } else {
                 break;

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlanPhase.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlanPhase.java
index 142ae9e..e4308f8 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlanPhase.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlanPhase.java
@@ -25,16 +25,15 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
 import org.killbill.billing.ErrorCode;
-import org.killbill.billing.catalog.api.BillingPeriod;
 import org.killbill.billing.catalog.api.CatalogApiException;
 import org.killbill.billing.catalog.api.Duration;
-import org.killbill.billing.catalog.api.InternationalPrice;
-import org.killbill.billing.catalog.api.Limit;
+import org.killbill.billing.catalog.api.Fixed;
 import org.killbill.billing.catalog.api.PhaseType;
 import org.killbill.billing.catalog.api.Plan;
 import org.killbill.billing.catalog.api.PlanPhase;
+import org.killbill.billing.catalog.api.Recurring;
+import org.killbill.billing.catalog.api.Usage;
 import org.killbill.billing.util.config.catalog.ValidatingConfig;
-import org.killbill.billing.util.config.catalog.ValidationError;
 import org.killbill.billing.util.config.catalog.ValidationErrors;
 
 @XmlAccessorType(XmlAccessType.NONE)
@@ -46,22 +45,15 @@ public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implem
     @XmlElement(required = true)
     private DefaultDuration duration;
 
-    @XmlElement(required = true)
-    private BillingPeriod billingPeriod;
-
     @XmlElement(required = false)
-    private DefaultInternationalPrice recurringPrice;
+    private DefaultFixed fixed;
 
     @XmlElement(required = false)
-    private DefaultInternationalPrice fixedPrice;
+    private DefaultRecurring recurring;
 
-    @XmlElementWrapper(name = "limits", required = false)
-    @XmlElement(name = "limit", required = true)
-    private DefaultLimit[] limits = new DefaultLimit[0];
-
-//  Not supported: variable pricing
-//	@XmlElement(required=false)
-//	private InternationalPrice unitPrice;
+    @XmlElementWrapper(name = "usages", required = false)
+    @XmlElement(name = "usage", required = false)
+    private DefaultUsage[] usages;
 
     //Not exposed in XML
     private Plan plan;
@@ -79,42 +71,38 @@ public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implem
         throw new CatalogApiException(ErrorCode.CAT_BAD_PHASE_NAME, phaseName);
     }
 
-
     /* (non-Javadoc)
-      * @see org.killbill.billing.catalog.IPlanPhase#getRecurringPrice()
+      * @see org.killbill.billing.catalog.IPlanPhase#getCohort()
       */
     @Override
-    public DefaultInternationalPrice getRecurringPrice() {
-        return recurringPrice;
+    public PhaseType getPhaseType() {
+        return type;
     }
 
-    /* (non-Javadoc)
-      * @see org.killbill.billing.catalog.IPlanPhase#getInternationalPrice()
-      */
     @Override
-    public InternationalPrice getFixedPrice() {
-        return fixedPrice;
+    public boolean compliesWithLimits(final String unit, final double value) {
+        // TODO STEPH
+        return true;
     }
 
-    /* (non-Javadoc)
-      * @see org.killbill.billing.catalog.IPlanPhase#getCohort()
-      */
     @Override
-    public PhaseType getPhaseType() {
-        return type;
+    public Fixed getFixed() {
+        return fixed;
+    }
+
+    @Override
+    public Recurring getRecurring() {
+        return recurring;
     }
 
-    /* (non-Javadoc)
-      * @see org.killbill.billing.catalog.IPlanPhase#getBillCycleDuration()
-      */
     @Override
-    public BillingPeriod getBillingPeriod() {
-        return billingPeriod;
+    public Usage[] getUsages() {
+        return usages;
     }
 
     /* (non-Javadoc)
-      * @see org.killbill.billing.catalog.IPlanPhase#getName()
-      */
+          * @see org.killbill.billing.catalog.IPlanPhase#getName()
+          */
     @Override
     public String getName() {
         return phaseName(plan.getName(), this.getPhaseType());
@@ -138,58 +126,12 @@ public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implem
         return duration;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.killbill.billing.catalog.PlanPhase#getLimit()
-     */
-    @Override
-    public DefaultLimit[] getLimits() {
-        return limits;
-    }
-    
-    
-    protected Limit findLimit(String unit) {
-        for(Limit limit: limits) {
-            if(limit.getUnit().getName().equals(unit) ) {
-                    return limit;
-            }
-        }
-        return null;
-    }
-    
-    
-    @Override
-    public boolean compliesWithLimits(String unit, double value) {
-        Limit l = findLimit(unit);
-        if (l == null) {
-            return getPlan().getProduct().compliesWithLimits(unit, value);
-        }
-        return l.compliesWith(value);
-    }
-
-
     @Override
     public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
-        //Validation: check for nulls
-        if (billingPeriod == null) {
-            errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
-                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
-        }
 
-        //Validation: if there is a recurring price there must be a billing period
-        if ((recurringPrice != null) && (billingPeriod == null || billingPeriod == BillingPeriod.NO_BILLING_PERIOD)) {
-            errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
-                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
-        }
-
-        //Validation: if there is no recurring price there should be no billing period
-        if ((recurringPrice == null) && billingPeriod != BillingPeriod.NO_BILLING_PERIOD) {
-            errors.add(new ValidationError(String.format("Phase %s of plan %s has no recurring price but does have a billing period. The billing period should be set to '%s'",
-                                                         type.toString(), plan.getName(), BillingPeriod.NO_BILLING_PERIOD),
-                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
-        }
+        // TODO STEPH check there is either fixed and/or/usage and/or recurring defined.
 
+        /*
         //Validation: if there BP is set to NO_BILLING_PERIOD there must be a fixed price
         if ((billingPeriod == BillingPeriod.NO_BILLING_PERIOD && fixedPrice == null)) {
             errors.add(new ValidationError(String.format("Phase %s of plan %s has no billing period. It must have a fixed price set.",
@@ -203,36 +145,45 @@ public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implem
                                                          type.toString(), plan.getName()),
                                            catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
         }
+        */
         return errors;
     }
 
     @Override
     public void initialize(final StandaloneCatalog root, final URI uri) {
-        if (fixedPrice != null) {
-            fixedPrice.initialize(root, uri);
+        if (fixed != null) {
+            fixed.initialize(root, uri);
+            fixed.setPhase(this);
+        }
+        if (recurring != null) {
+            recurring.initialize(root, uri);
+            recurring.setPhase(this);
         }
-        if (recurringPrice != null) {
-            recurringPrice.initialize(root, uri);
+        if (usages != null) {
+            for (DefaultUsage usage : usages) {
+                usage.initialize(root, uri);
+                usage.setPhase(this);
+            }
         }
     }
 
-    protected DefaultPlanPhase setFixedPrice(final DefaultInternationalPrice price) {
-        this.fixedPrice = price;
+    protected DefaultPlanPhase setFixed(final DefaultFixed fixed) {
+        this.fixed = fixed;
         return this;
     }
 
-    protected DefaultPlanPhase setRecurringPrice(final DefaultInternationalPrice price) {
-        this.recurringPrice = price;
+    protected DefaultPlanPhase setRecurring(final DefaultRecurring recurring) {
+        this.recurring = recurring;
         return this;
     }
 
-    protected DefaultPlanPhase setPhaseType(final PhaseType cohort) {
-        this.type = cohort;
+    protected DefaultPlanPhase setUsages(final DefaultUsage []  usages) {
+        this.usages = usages;
         return this;
     }
 
-    protected DefaultPlanPhase setBillingPeriod(final BillingPeriod billingPeriod) {
-        this.billingPeriod = billingPeriod;
+    protected DefaultPlanPhase setPhaseType(final PhaseType cohort) {
+        this.type = cohort;
         return this;
     }
 
@@ -245,10 +196,4 @@ public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implem
         this.plan = plan;
         return this;
     }
-
-    protected DefaultPlanPhase setBillCycleDuration(final BillingPeriod billingPeriod) {
-        this.billingPeriod = billingPeriod;
-        return this;
-    }
-
 }

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceList.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceList.java
index cdfdbff..ad4b4ba 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceList.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceList.java
@@ -79,7 +79,7 @@ public class DefaultPriceList extends ValidatingConfig<StandaloneCatalog> implem
     public DefaultPlan findPlan(final Product product, final BillingPeriod period) {
         for (final DefaultPlan cur : getPlans()) {
             if (cur.getProduct().equals(product) &&
-                    (cur.getBillingPeriod() == null || cur.getBillingPeriod().equals(period))) {
+                    (cur.getRecurringBillingPeriod() == null || cur.getRecurringBillingPeriod().equals(period))) {
                 return cur;
             }
         }
@@ -89,11 +89,11 @@ public class DefaultPriceList extends ValidatingConfig<StandaloneCatalog> implem
     @Override
     public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
         for (final DefaultPlan cur : getPlans()) {
-            final int numPlans = findNumberOfPlans(cur.getProduct(), cur.getBillingPeriod());
+            final int numPlans = findNumberOfPlans(cur.getProduct(), cur.getRecurringBillingPeriod());
             if (numPlans > 1) {
                 errors.add(new ValidationError(
                         String.format("There are %d plans in pricelist %s and have the same product/billingPeriod (%s, %s)",
-                                      numPlans, getName(), cur.getProduct().getName(), cur.getBillingPeriod()), catalog.getCatalogURI(),
+                                      numPlans, getName(), cur.getProduct().getName(), cur.getRecurringBillingPeriod()), catalog.getCatalogURI(),
                         DefaultPriceListSet.class, getName()));
             }
         }
@@ -104,7 +104,7 @@ public class DefaultPriceList extends ValidatingConfig<StandaloneCatalog> implem
         int count = 0;
         for (final DefaultPlan cur : getPlans()) {
             if (cur.getProduct().equals(product) &&
-                    (cur.getBillingPeriod() == null || cur.getBillingPeriod().equals(period))) {
+                    (cur.getRecurringBillingPeriod() == null || cur.getRecurringBillingPeriod().equals(period))) {
                 count++;
             }
         }

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultRecurring.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultRecurring.java
new file mode 100644
index 0000000..3ed196f
--- /dev/null
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultRecurring.java
@@ -0,0 +1,83 @@
+package org.killbill.billing.catalog;
+
+import java.net.URI;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+import org.killbill.billing.catalog.api.BillingPeriod;
+import org.killbill.billing.catalog.api.PlanPhase;
+import org.killbill.billing.catalog.api.Recurring;
+import org.killbill.billing.util.config.catalog.ValidatingConfig;
+import org.killbill.billing.util.config.catalog.ValidationError;
+import org.killbill.billing.util.config.catalog.ValidationErrors;
+
+@XmlAccessorType(XmlAccessType.NONE)
+public class DefaultRecurring extends ValidatingConfig<StandaloneCatalog> implements Recurring {
+
+    @XmlElement(required = true)
+    private BillingPeriod billingPeriod;
+
+    @XmlElement(required = false)
+    private DefaultInternationalPrice recurringPrice;
+
+    // Not exposed in xml.
+    private PlanPhase phase;
+
+    @Override
+    public BillingPeriod getBillingPeriod() {
+        return billingPeriod;
+    }
+
+    @Override
+    public DefaultInternationalPrice getRecurringPrice() {
+        return recurringPrice;
+    }
+
+    @Override
+    public void initialize(final StandaloneCatalog root, final URI uri) {
+        if (recurringPrice != null) {
+            recurringPrice.initialize(root, uri);
+        }
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+
+        //Validation: check for nulls
+        if (billingPeriod == null) {
+            errors.add(new ValidationError(String.format("Recurring section of Phase %s of plan %s has a recurring price but no billing period", phase.getPhaseType().toString(), phase.getPlan().getName()),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, phase.getPhaseType().toString()));
+        }
+
+        //Validation: if there is a recurring price there must be a billing period
+        if ((recurringPrice != null) && (billingPeriod == null || billingPeriod == BillingPeriod.NO_BILLING_PERIOD)) {
+            errors.add(new ValidationError(String.format("Recurring section of Phase %s of plan %s has a recurring price but no billing period", phase.getPhaseType().toString(), phase.getPlan().getName()),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, phase.getPhaseType().toString()));
+        }
+
+        //Validation: if there is no recurring price there should be no billing period
+        if ((recurringPrice == null) && billingPeriod != BillingPeriod.NO_BILLING_PERIOD) {
+            errors.add(new ValidationError(String.format("Recurring section of Phase %s of plan %s has no recurring price but does have a billing period. The billing period should be set to '%s'",
+                                                         phase.getPhaseType().toString(), phase.getPlan().getName(), BillingPeriod.NO_BILLING_PERIOD),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, phase.getPhaseType().toString()));
+        }
+        return errors;
+    }
+
+    public DefaultRecurring setBillingPeriod(final BillingPeriod billingPeriod) {
+        this.billingPeriod = billingPeriod;
+        return this;
+    }
+
+    public DefaultRecurring setRecurringPrice(final DefaultInternationalPrice recurringPrice) {
+        this.recurringPrice = recurringPrice;
+        return this;
+    }
+
+    public DefaultRecurring setPhase(final PlanPhase phase) {
+        this.phase = phase;
+        return this;
+    }
+}

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultUsage.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultUsage.java
new file mode 100644
index 0000000..0c2372c
--- /dev/null
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultUsage.java
@@ -0,0 +1,97 @@
+package org.killbill.billing.catalog;
+
+import java.net.URI;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+import org.killbill.billing.catalog.api.BillingPeriod;
+import org.killbill.billing.catalog.api.PlanPhase;
+import org.killbill.billing.catalog.api.Usage;
+import org.killbill.billing.util.config.catalog.ValidatingConfig;
+import org.killbill.billing.util.config.catalog.ValidationErrors;
+
+@XmlAccessorType(XmlAccessType.NONE)
+public class DefaultUsage extends ValidatingConfig<StandaloneCatalog> implements Usage {
+
+    @XmlElement(required = true)
+    private BillingPeriod billingPeriod;
+
+    @Override
+    public BillingPeriod getBillingPeriod() {
+        return billingPeriod;
+    }
+
+    // Not exposed in xml.
+    private PlanPhase phase;
+
+    @Override
+    public boolean compliesWithLimits(final String s, final double v) {
+        return false;
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog root, final ValidationErrors errors) {
+        return null;
+    }
+
+    @Override
+    public void initialize(final StandaloneCatalog root, final URI uri) {
+
+    }
+
+    public DefaultUsage setBillingPeriod(final BillingPeriod billingPeriod) {
+        this.billingPeriod = billingPeriod;
+        return this;
+    }
+
+    public DefaultUsage setPhase(final PlanPhase phase) {
+        this.phase = phase;
+        return this;
+    }
+
+    /*
+        /*
+     * (non-Javadoc)
+     *
+     * @see org.killbill.billing.catalog.PlanPhase#getLimit()
+     */
+
+
+    /*
+    @Override
+    public DefaultLimit[] getLimits() {
+        return limits;
+    }
+
+
+    protected Limit findLimit(String unit) {
+
+        for (Limit limit : limits) {
+            if (limit.getUnit().getName().equals(unit)) {
+                return limit;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean compliesWithLimits(String unit, double value) {
+        Limit l = findLimit(unit);
+        if (l == null) {
+            return getPlan().getProduct().compliesWithLimits(unit, value);
+        }
+        return l.compliesWith(value);
+    }
+
+
+    */
+
+    /*
+    @XmlElementWrapper(name = "limits", required = false)
+    @XmlElement(name = "limit", required = true)
+    private DefaultLimit[] limits = new DefaultLimit[0];
+    */
+
+}

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/io/TestXMLReader.java b/catalog/src/test/java/org/killbill/billing/catalog/io/TestXMLReader.java
index 0b906af..91bb637 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/io/TestXMLReader.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/io/TestXMLReader.java
@@ -16,21 +16,23 @@
 
 package org.killbill.billing.catalog.io;
 
+import org.killbill.billing.catalog.CatalogTestSuiteNoDB;
+import org.killbill.billing.catalog.StandaloneCatalog;
+import org.killbill.billing.util.config.catalog.XMLLoader;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.google.common.io.Resources;
-import org.killbill.billing.catalog.CatalogTestSuiteNoDB;
-import org.killbill.billing.catalog.StandaloneCatalog;
-import org.killbill.billing.util.config.catalog.XMLLoader;
 
 public class TestXMLReader extends CatalogTestSuiteNoDB {
+
     @Test(groups = "fast")
     public void testCatalogLoad() {
         try {
             XMLLoader.getObjectFromString(Resources.getResource("WeaponsHire.xml").toExternalForm(), StandaloneCatalog.class);
             XMLLoader.getObjectFromString(Resources.getResource("WeaponsHireSmall.xml").toExternalForm(), StandaloneCatalog.class);
             XMLLoader.getObjectFromString(Resources.getResource("SpyCarBasic.xml").toExternalForm(), StandaloneCatalog.class);
+            XMLLoader.getObjectFromString(Resources.getResource("SpyCarAdvanced.xml").toExternalForm(), StandaloneCatalog.class);
         } catch (Exception e) {
             Assert.fail(e.toString());
         }

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/MockFixed.java b/catalog/src/test/java/org/killbill/billing/catalog/MockFixed.java
new file mode 100644
index 0000000..311a353
--- /dev/null
+++ b/catalog/src/test/java/org/killbill/billing/catalog/MockFixed.java
@@ -0,0 +1,11 @@
+package org.killbill.billing.catalog;
+
+import org.killbill.billing.catalog.api.FixedType;
+
+public class MockFixed extends DefaultFixed {
+
+    public MockFixed(final DefaultInternationalPrice price) {
+        setType(FixedType.ONE_TIME);
+        setFixedPrice(price);
+    }
+}

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/MockPlanPhase.java b/catalog/src/test/java/org/killbill/billing/catalog/MockPlanPhase.java
index ab9aab6..cf1ea5b 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/MockPlanPhase.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/MockPlanPhase.java
@@ -68,11 +68,10 @@ public class MockPlanPhase extends DefaultPlanPhase {
             final DefaultDuration duration,
             final DefaultInternationalPrice recurringPrice,
             final DefaultInternationalPrice fixedPrice) {
-        setBillingPeriod(billingPeriod);
         setPhaseType(type);
         setDuration(duration);
-        setRecurringPrice(recurringPrice);
-        setFixedPrice(fixedPrice);
+        setFixed(new MockFixed(fixedPrice));
+        setRecurring(new MockRecurring(billingPeriod, recurringPrice));
     }
 
     public MockPlanPhase() {
@@ -94,29 +93,26 @@ public class MockPlanPhase extends DefaultPlanPhase {
                          @Nullable final MockInternationalPrice fixedPrice,
                          final BillingPeriod billingPeriod,
                          final PhaseType phaseType) {
-        setBillingPeriod(billingPeriod);
         setPhaseType(phaseType);
         setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
-        setRecurringPrice(recurringPrice);
-        setFixedPrice(fixedPrice);
         setPlan(new MockPlan(this));
+        setFixed(new MockFixed(fixedPrice));
+        setRecurring(new MockRecurring(billingPeriod, recurringPrice));
     }
 
     public MockPlanPhase(final MockPlan mockPlan) {
-        setBillingPeriod(BillingPeriod.MONTHLY);
         setPhaseType(PhaseType.EVERGREEN);
         setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
-        setRecurringPrice(new MockInternationalPrice());
-        setFixedPrice(null);
         setPlan(mockPlan);
+        setFixed(new MockFixed(null));
+        setRecurring(new MockRecurring(BillingPeriod.MONTHLY, new MockInternationalPrice()));
     }
 
     public MockPlanPhase(final Plan plan, final PhaseType phaseType) {
-        setBillingPeriod(BillingPeriod.MONTHLY);
         setPhaseType(phaseType);
         setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
-        setRecurringPrice(new MockInternationalPrice());
-        setFixedPrice(null);
         setPlan(plan);
+        setFixed(new MockFixed(null));
+        setRecurring(new MockRecurring(BillingPeriod.MONTHLY, new MockInternationalPrice()));
     }
 }

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/MockRecurring.java b/catalog/src/test/java/org/killbill/billing/catalog/MockRecurring.java
new file mode 100644
index 0000000..30c4a97
--- /dev/null
+++ b/catalog/src/test/java/org/killbill/billing/catalog/MockRecurring.java
@@ -0,0 +1,13 @@
+package org.killbill.billing.catalog;
+
+import org.killbill.billing.catalog.api.BillingPeriod;
+
+public class MockRecurring extends DefaultRecurring {
+
+    public MockRecurring(final BillingPeriod billingPeriod,
+                         final DefaultInternationalPrice recurringPrice) {
+        setBillingPeriod(billingPeriod);
+        setRecurringPrice(recurringPrice);
+    }
+
+}

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/TestInternationalPrice.java b/catalog/src/test/java/org/killbill/billing/catalog/TestInternationalPrice.java
index dd62253..9fb17df 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/TestInternationalPrice.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/TestInternationalPrice.java
@@ -63,9 +63,9 @@ public class TestInternationalPrice extends CatalogTestSuiteNoDB {
     public void testPriceInitialization() throws URISyntaxException, CatalogApiException {
         final StandaloneCatalog c = new MockCatalog();
         c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
-        c.getCurrentPlans()[0].getFinalPhase().getRecurringPrice().setPrices(null);
+        ((DefaultInternationalPrice) c.getCurrentPlans()[0].getFinalPhase().getRecurring().getRecurringPrice()).setPrices(null);
         c.initialize(c, new URI("foo://bar"));
-        Assert.assertEquals(c.getCurrentPlans()[0].getFinalPhase().getRecurringPrice().getPrice(Currency.GBP), new BigDecimal(0));
+        Assert.assertEquals(c.getCurrentPlans()[0].getFinalPhase().getRecurring().getRecurringPrice().getPrice(Currency.GBP), new BigDecimal(0));
     }
 
     @Test(groups = "fast")

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/TestPlanPhase.java b/catalog/src/test/java/org/killbill/billing/catalog/TestPlanPhase.java
index 7fcf043..03820e7 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/TestPlanPhase.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/TestPlanPhase.java
@@ -28,20 +28,23 @@ public class TestPlanPhase extends CatalogTestSuiteNoDB {
 
     @Test(groups = "fast")
     public void testValidation() {
-        DefaultPlanPhase pp = MockPlanPhase.createUSDMonthlyEvergreen(null, "1.00").setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());//new MockPlanPhase().setBillCycleDuration(BillingPeriod.MONTHLY).setRecurringPrice(null).setFixedPrice(new DefaultInternationalPrice());
+        DefaultPlanPhase pp = MockPlanPhase.createUSDMonthlyEvergreen(null, "1.00").setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());
 
         ValidationErrors errors = pp.validate(new MockCatalog(), new ValidationErrors());
         errors.log(log);
         Assert.assertEquals(errors.size(), 1);
 
-        pp = MockPlanPhase.createUSDMonthlyEvergreen("1.00", null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());// new MockPlanPhase().setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setRecurringPrice(new MockInternationalPrice());
+        /*
+        TODO STEPH
+        pp = MockPlanPhase.createUSDMonthlyEvergreen("1.00", null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());
         errors = pp.validate(new MockCatalog(), new ValidationErrors());
         errors.log(log);
         Assert.assertEquals(errors.size(), 2);
 
-        pp = MockPlanPhase.createUSDMonthlyEvergreen(null, null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());//new MockPlanPhase().setRecurringPrice(null).setFixedPrice(null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD);
+        pp = MockPlanPhase.createUSDMonthlyEvergreen(null, null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());
         errors = pp.validate(new MockCatalog(), new ValidationErrors());
         errors.log(log);
+        */
         Assert.assertEquals(errors.size(), 2);
     }
 

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/TestPriceListSet.java b/catalog/src/test/java/org/killbill/billing/catalog/TestPriceListSet.java
index c215fd7..d38438a 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/TestPriceListSet.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/TestPriceListSet.java
@@ -37,14 +37,14 @@ public class TestPriceListSet extends CatalogTestSuiteNoDB {
         final DefaultProduct foo = new DefaultProduct("Foo", ProductCategory.BASE);
         final DefaultProduct bar = new DefaultProduct("Bar", ProductCategory.BASE);
         final DefaultPlan[] defaultPlans = new DefaultPlan[]{
-                new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-                new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-                new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(EVERGREEN)),
-                new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(EVERGREEN))
+                new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(MONTHLY, null)).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(MONTHLY, null)).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(ANNUAL, null)).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(ANNUAL, null)).setPhaseType(EVERGREEN))
         };
         final DefaultPlan[] childPlans = new DefaultPlan[]{
-                new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT)),
-                new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT))
+                new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(ANNUAL, null)).setPhaseType(DISCOUNT)),
+                new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(ANNUAL, null)).setPhaseType(DISCOUNT))
         };
         final PriceListDefault defaultPriceList = new PriceListDefault(defaultPlans);
         final DefaultPriceList[] childPriceLists = new DefaultPriceList[]{
@@ -63,14 +63,14 @@ public class TestPriceListSet extends CatalogTestSuiteNoDB {
         final DefaultProduct foo = new DefaultProduct("Foo", ProductCategory.BASE);
         final DefaultProduct bar = new DefaultProduct("Bar", ProductCategory.BASE);
         final DefaultPlan[] defaultPlans = new DefaultPlan[]{
-                new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-                new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-                new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(null).setPhaseType(EVERGREEN)),
-                new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(null).setPhaseType(EVERGREEN))
+                new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(MONTHLY, null)).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(MONTHLY, null)).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(null, null)).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(null, null)).setPhaseType(EVERGREEN))
         };
         final DefaultPlan[] childPlans = new DefaultPlan[]{
-                new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT)),
-                new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT))
+                new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(ANNUAL, null)).setPhaseType(DISCOUNT)),
+                new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setRecurring(new MockRecurring(ANNUAL, null)).setPhaseType(DISCOUNT))
         };
 
         final PriceListDefault defaultPriceList = new PriceListDefault(defaultPlans);

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java b/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java
index 32a6354..5c5fab0 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java
@@ -77,10 +77,10 @@ public class TestVersionedCatalog extends CatalogTestSuiteNoDB {
         final Plan newSubPlan214 = vc.findPlan("pistol-monthly", dt214, dt214);
         final Plan newSubPlan3 = vc.findPlan("pistol-monthly", dt3, dt3);
 
-        Assert.assertEquals(newSubPlan1.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("1.0"));
-        Assert.assertEquals(newSubPlan2.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
-        Assert.assertEquals(newSubPlan214.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
-        Assert.assertEquals(newSubPlan3.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("3.0"));
+        Assert.assertEquals(newSubPlan1.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("29.95"));
+        Assert.assertEquals(newSubPlan2.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));
+        Assert.assertEquals(newSubPlan214.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));
+        Assert.assertEquals(newSubPlan3.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("49.95"));
 
         // Existing subscription
 
@@ -88,9 +88,9 @@ public class TestVersionedCatalog extends CatalogTestSuiteNoDB {
         final Plan exSubPlan214 = vc.findPlan("pistol-monthly", dt214, dt1);
         final Plan exSubPlan3 = vc.findPlan("pistol-monthly", dt3, dt1);
 
-        Assert.assertEquals(exSubPlan2.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("1.0"));
-        Assert.assertEquals(exSubPlan214.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
-        Assert.assertEquals(exSubPlan3.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
+        Assert.assertEquals(exSubPlan2.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("29.95"));
+        Assert.assertEquals(exSubPlan214.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));
+        Assert.assertEquals(exSubPlan3.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));
 
     }
 

diff --git a/catalog/src/test/resources/SpyCarAdvanced.xml b/catalog/src/test/resources/SpyCarAdvanced.xml
index e6339d6..de7d4a6 100644
--- a/catalog/src/test/resources/SpyCarAdvanced.xml
+++ b/catalog/src/test/resources/SpyCarAdvanced.xml
@@ -24,6 +24,9 @@
     <currencies>
         <currency>USD</currency>
         <currency>GBP</currency>
+        <currency>EUR</currency>
+        <currency>JPY</currency>
+        <currency>BTC</currency>
     </currencies>
 
     <products>
@@ -120,10 +123,6 @@
             </billingAlignmentCase>
             <billingAlignmentCase>
                 <billingPeriod>ANNUAL</billingPeriod>
-                <alignment>ACCOUNT</alignment>
-            </billingAlignmentCase>
-            <billingAlignmentCase>
-                <billingPeriod>ANNUAL</billingPeriod>
                 <alignment>SUBSCRIPTION</alignment>
             </billingAlignmentCase>
             <billingAlignmentCase>
@@ -146,6 +145,51 @@
     </rules>
 
     <plans>
+        <plan name="standard-annual">
+            <product>Standard</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>750.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>850.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1000.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>1.0</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
         <plan name="standard-monthly">
             <product>Standard</product>
             <initialPhases>
@@ -154,26 +198,41 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>75.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>100.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>75.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>85.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>10.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.1</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="sports-monthly">
@@ -184,26 +243,41 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>375.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>500.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>375.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>425.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>500.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>50.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.5</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="super-monthly">
@@ -214,26 +288,41 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>750.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>1000.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>750.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>850.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1000.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>1.0</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="discount-standard-monthly">
@@ -244,43 +333,72 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>3</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>50.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>60.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>66.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>6.60</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.06</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>50.00</value>
+                            <value>75.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>85.00</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>66.00</value>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>10.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.1</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>75.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>100.00</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="discount-sports-monthly">
@@ -291,43 +409,72 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>3</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>250.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>300.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>333.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>33.30</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.3</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>250.00</value>
+                            <value>375.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>425.00</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>333.00</value>
+                            <value>500.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>50.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.5</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>375.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>500.00</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="discount-super-monthly">
@@ -338,87 +485,207 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>3</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>500.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>600.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>666.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>66.60</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.6</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>500.00</value>
+                            <value>750.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>850.00</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>666.00</value>
+                            <value>1000.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>1.0</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>750.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>1000.00</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="oilslick-monthly">
             <product>OilSlick</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>2.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>3.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>4.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>0.40</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.01</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>5.95</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>7.95</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>5.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>7.95</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>0.80</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.01</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="remotecontrol-monthly">
             <product>RemoteControl</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>5.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>7.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>8.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>0.80</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.01</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>15.95</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>17.95</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>15.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>16.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>17.95</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>1.79</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.01</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
     </plans>
     <priceLists>
         <defaultPriceList name="DEFAULT">
             <plans>
+                <plan>standard-annual</plan>
                 <plan>standard-monthly</plan>
                 <plan>sports-monthly</plan>
                 <plan>super-monthly</plan>

diff --git a/catalog/src/test/resources/SpyCarBasic.xml b/catalog/src/test/resources/SpyCarBasic.xml
index 7db7465..9e59993 100644
--- a/catalog/src/test/resources/SpyCarBasic.xml
+++ b/catalog/src/test/resources/SpyCarBasic.xml
@@ -16,7 +16,7 @@
   -->
 
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
     <effectiveDate>2013-02-08T00:00:00+00:00</effectiveDate>
     <catalogName>SpyCarBasic</catalogName>
@@ -45,7 +45,7 @@
             </changePolicyCase>
         </changePolicy>
         <changeAlignment>
-           <changeAlignmentCase>
+            <changeAlignmentCase>
                 <alignment>START_OF_BUNDLE</alignment>
             </changeAlignmentCase>
         </changeAlignment>
@@ -65,9 +65,9 @@
             </billingAlignmentCase>
         </billingAlignment>
         <priceList>
-           <priceListCase>
+            <priceListCase>
                 <toPriceList>DEFAULT</toPriceList>
-           </priceListCase>
+            </priceListCase>
         </priceList>
     </rules>
 
@@ -80,26 +80,30 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>75.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>100.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>75.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>100.00</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="sports-monthly">
@@ -110,26 +114,29 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>375.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>500.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>375.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>500.00</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="super-monthly">
@@ -140,26 +147,30 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>750.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>1000.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>750.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1000.00</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
     </plans>

diff --git a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-1.xml b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-1.xml
index 03780a3..82aaaaa 100644
--- a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-1.xml
+++ b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-1.xml
@@ -16,48 +16,63 @@
   -->
 
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="../CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
-	<effectiveDate>2011-01-01T00:00:00+00:00</effectiveDate>
-	<catalogName>WeaponsHireSmall</catalogName>
+    <effectiveDate>2011-01-01T00:00:00+00:00</effectiveDate>
+    <catalogName>WeaponsHireSmall</catalogName>
 
-	<currencies>
-		<currency>USD</currency>
-		<currency>EUR</currency>
-		<currency>GBP</currency>
-	</currencies>
+    <currencies>
+        <currency>USD</currency>
+        <currency>EUR</currency>
+        <currency>GBP</currency>
+    </currencies>
 
-	<products>
-		<product name="Pistol">
-			<category>BASE</category>
-		</product>
-		<product name="Shotgun">
-			<category>BASE</category>
-		</product>
-		<product name="Laser-Scope">
-			<category>ADD_ON</category>
-		</product>
-	</products>
-	 
-	<rules>
-		<changePolicy>
-			<changePolicyCase> 
-				<fromBillingPeriod>MONTHLY</fromBillingPeriod>
-				<toProduct>Shotgun</toProduct>
-				<toBillingPeriod>MONTHLY</toBillingPeriod>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-			<changePolicyCase> 
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>	
-		</changePolicy>
-		<changeAlignment>
-			<changeAlignmentCase>
-				<alignment>START_OF_SUBSCRIPTION</alignment>
-			</changeAlignmentCase>
-		</changeAlignment>
-		 <createAlignment>
+    <units>
+        <unit name="targets"/>
+        <unit name="misfires"/>
+        <unit name="shells"/>
+    </units>
+
+    <products>
+        <product name="Pistol">
+            <category>BASE</category>
+        </product>
+        <product name="Shotgun">
+            <category>BASE</category>
+            <limits>
+                <limit>
+                    <unit>shells</unit>
+                    <max>300</max>
+                </limit>
+            </limits>
+        </product>
+        <product name="Laser-Scope">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Extra-Ammo">
+            <category>ADD_ON</category>
+        </product>
+    </products>
+
+    <rules>
+        <changePolicy>
+            <changePolicyCase>
+                <fromBillingPeriod>MONTHLY</fromBillingPeriod>
+                <toProduct>Shotgun</toProduct>
+                <toBillingPeriod>MONTHLY</toBillingPeriod>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+        </changePolicy>
+        <changeAlignment>
+            <changeAlignmentCase>
+                <alignment>START_OF_SUBSCRIPTION</alignment>
+            </changeAlignmentCase>
+        </changeAlignment>
+        <createAlignment>
             <createAlignmentCase>
                 <product>Laser-Scope</product>
                 <alignment>START_OF_SUBSCRIPTION</alignment>
@@ -66,93 +81,200 @@
                 <alignment>START_OF_BUNDLE</alignment>
             </createAlignmentCase>
         </createAlignment>
-	</rules>
- 
-	<plans>
-		<plan name="pistol-monthly">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice> <!-- empty price implies $0 -->
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>GBP</currency><value>1.0</value></price>
-					<price><currency>EUR</currency><value>1.0</value></price> 
-					<price><currency>USD</currency><value>1.0</value></price>								
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-monthly">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice></fixedPrice>
-				    <!-- no price implies $0 -->
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-					<number>-1</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>249.95</value></price>								
-					<price><currency>EUR</currency><value>149.95</value></price>
-					<price><currency>GBP</currency><value>169.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>2399.95</value></price>								
-					<price><currency>EUR</currency><value>1499.95</value></price>
-					<price><currency>GBP</currency><value>1699.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-	</plans>
-	<priceLists>
-		<defaultPriceList name="DEFAULT">			
-				<plans>	
-				<plan>pistol-monthly</plan>
-				<plan>shotgun-monthly</plan>
-				<plan>shotgun-annual</plan>
-			</plans>
-		</defaultPriceList>
-	</priceLists>
+    </rules>
+
+    <plans>
+        <plan name="pistol-monthly">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>29.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>targets</unit>
+                            <min>3</min>
+                        </limit>
+                        <limit>
+                            <unit>misfires</unit>
+                            <max>20</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-monthly">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                    <number>-1</number>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>249.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>149.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>169.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>shells</unit>
+                            <max>200</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="laser-scope-monthly">
+            <product>Laser-Scope</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="extra-ammo-monthly">
+            <product>Extra-Ammo</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+    </plans>
+    <priceLists>
+        <defaultPriceList name="DEFAULT">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>shotgun-annual</plan>
+            </plans>
+        </defaultPriceList>
+    </priceLists>
 </catalog>

diff --git a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml
index 5d3a927..ef05026 100644
--- a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml
+++ b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml
@@ -16,48 +16,63 @@
   -->
 
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="../CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
-	<effectiveDate>2011-02-02T00:00:00+00:00</effectiveDate>
-	<catalogName>WeaponsHireSmall</catalogName>
+    <effectiveDate>2011-02-01T00:00:00+00:00</effectiveDate>
+    <catalogName>WeaponsHireSmall</catalogName>
 
-	<currencies>
-		<currency>USD</currency>
-		<currency>EUR</currency>
-		<currency>GBP</currency>
-	</currencies>
+    <currencies>
+        <currency>USD</currency>
+        <currency>EUR</currency>
+        <currency>GBP</currency>
+    </currencies>
 
-	<products>
-		<product name="Pistol">
-			<category>BASE</category>
-		</product>
-		<product name="Shotgun">
-			<category>BASE</category>
-		</product>
-		<product name="Laser-Scope">
-			<category>ADD_ON</category>
-		</product>
-	</products>
-	 
-	<rules>
-		<changePolicy>
-			<changePolicyCase> 
-				<fromBillingPeriod>MONTHLY</fromBillingPeriod>
-				<toProduct>Shotgun</toProduct>
-				<toBillingPeriod>MONTHLY</toBillingPeriod>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-			<changePolicyCase> 
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>	
-		</changePolicy>
-		<changeAlignment>
-			<changeAlignmentCase>
-				<alignment>START_OF_SUBSCRIPTION</alignment>
-			</changeAlignmentCase>
-		</changeAlignment>
-		 <createAlignment>
+    <units>
+        <unit name="targets"/>
+        <unit name="misfires"/>
+        <unit name="shells"/>
+    </units>
+
+    <products>
+        <product name="Pistol">
+            <category>BASE</category>
+        </product>
+        <product name="Shotgun">
+            <category>BASE</category>
+            <limits>
+                <limit>
+                    <unit>shells</unit>
+                    <max>300</max>
+                </limit>
+            </limits>
+        </product>
+        <product name="Laser-Scope">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Extra-Ammo">
+            <category>ADD_ON</category>
+        </product>
+    </products>
+
+    <rules>
+        <changePolicy>
+            <changePolicyCase>
+                <fromBillingPeriod>MONTHLY</fromBillingPeriod>
+                <toProduct>Shotgun</toProduct>
+                <toBillingPeriod>MONTHLY</toBillingPeriod>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+        </changePolicy>
+        <changeAlignment>
+            <changeAlignmentCase>
+                <alignment>START_OF_SUBSCRIPTION</alignment>
+            </changeAlignmentCase>
+        </changeAlignment>
+        <createAlignment>
             <createAlignmentCase>
                 <product>Laser-Scope</product>
                 <alignment>START_OF_SUBSCRIPTION</alignment>
@@ -66,94 +81,202 @@
                 <alignment>START_OF_BUNDLE</alignment>
             </createAlignmentCase>
         </createAlignment>
-	</rules>
+    </rules>
+
+    <plans>
+        <plan name="pistol-monthly">
+            <effectiveDateForExistingSubscriptons>2011-02-14T00:00:00+00:00</effectiveDateForExistingSubscriptons>
+
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>39.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>39.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>39.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>targets</unit>
+                            <min>3</min>
+                        </limit>
+                        <limit>
+                            <unit>misfires</unit>
+                            <max>20</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-monthly">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                    <number>-1</number>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>249.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>149.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>169.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>shells</unit>
+                            <max>200</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="laser-scope-monthly">
+            <product>Laser-Scope</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
 
-	<plans>
-		<plan name="pistol-monthly">
-			<effectiveDateForExistingSubscriptons>2011-02-14T00:00:00+00:00</effectiveDateForExistingSubscriptons>
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice> <!-- empty price implies $0 -->
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>GBP</currency><value>2.0</value></price>
-					<price><currency>EUR</currency><value>2.0</value></price> 
-					<price><currency>USD</currency><value>2.0</value></price>								
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-monthly">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice></fixedPrice>
-				    <!-- no price implies $0 -->
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-					<number>-1</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>249.95</value></price>								
-					<price><currency>EUR</currency><value>149.95</value></price>
-					<price><currency>GBP</currency><value>169.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>2399.95</value></price>								
-					<price><currency>EUR</currency><value>1499.95</value></price>
-					<price><currency>GBP</currency><value>1699.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-	</plans>
-	<priceLists>
-		<defaultPriceList name="DEFAULT">			
-				<plans>	
-				<plan>pistol-monthly</plan>
-				<plan>shotgun-monthly</plan>
-				<plan>shotgun-annual</plan>
-			</plans>
-		</defaultPriceList>
-	</priceLists>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="extra-ammo-monthly">
+            <product>Extra-Ammo</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+    </plans>
+    <priceLists>
+        <defaultPriceList name="DEFAULT">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>shotgun-annual</plan>
+            </plans>
+        </defaultPriceList>
+    </priceLists>
 </catalog>

diff --git a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml
index f464408..0e2de86 100644
--- a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml
+++ b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml
@@ -16,48 +16,63 @@
   -->
 
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="../CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
-	<effectiveDate>2011-03-03T00:00:00+00:00</effectiveDate>
-	<catalogName>WeaponsHireSmall</catalogName>
+    <effectiveDate>2011-03-01T00:00:00+00:00</effectiveDate>
+    <catalogName>WeaponsHireSmall</catalogName>
 
-	<currencies>
-		<currency>USD</currency>
-		<currency>EUR</currency>
-		<currency>GBP</currency>
-	</currencies>
+    <currencies>
+        <currency>USD</currency>
+        <currency>EUR</currency>
+        <currency>GBP</currency>
+    </currencies>
 
-	<products>
-		<product name="Pistol">
-			<category>BASE</category>
-		</product>
-		<product name="Shotgun">
-			<category>BASE</category>
-		</product>
-		<product name="Laser-Scope">
-			<category>ADD_ON</category>
-		</product>
-	</products>
-	 
-	<rules>
-		<changePolicy>
-			<changePolicyCase> 
-				<fromBillingPeriod>MONTHLY</fromBillingPeriod>
-				<toProduct>Shotgun</toProduct>
-				<toBillingPeriod>MONTHLY</toBillingPeriod>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-			<changePolicyCase> 
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>	
-		</changePolicy>
-		<changeAlignment>
-			<changeAlignmentCase>
-				<alignment>START_OF_SUBSCRIPTION</alignment>
-			</changeAlignmentCase>
-		</changeAlignment>
-		 <createAlignment>
+    <units>
+        <unit name="targets"/>
+        <unit name="misfires"/>
+        <unit name="shells"/>
+    </units>
+
+    <products>
+        <product name="Pistol">
+            <category>BASE</category>
+        </product>
+        <product name="Shotgun">
+            <category>BASE</category>
+            <limits>
+                <limit>
+                    <unit>shells</unit>
+                    <max>300</max>
+                </limit>
+            </limits>
+        </product>
+        <product name="Laser-Scope">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Extra-Ammo">
+            <category>ADD_ON</category>
+        </product>
+    </products>
+
+    <rules>
+        <changePolicy>
+            <changePolicyCase>
+                <fromBillingPeriod>MONTHLY</fromBillingPeriod>
+                <toProduct>Shotgun</toProduct>
+                <toBillingPeriod>MONTHLY</toBillingPeriod>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+        </changePolicy>
+        <changeAlignment>
+            <changeAlignmentCase>
+                <alignment>START_OF_SUBSCRIPTION</alignment>
+            </changeAlignmentCase>
+        </changeAlignment>
+        <createAlignment>
             <createAlignmentCase>
                 <product>Laser-Scope</product>
                 <alignment>START_OF_SUBSCRIPTION</alignment>
@@ -66,93 +81,201 @@
                 <alignment>START_OF_BUNDLE</alignment>
             </createAlignmentCase>
         </createAlignment>
-	</rules>
+    </rules>
+
+    <plans>
+        <plan name="pistol-monthly">
+            <effectiveDateForExistingSubscriptons>2011-03-14T00:00:00+00:00</effectiveDateForExistingSubscriptons>
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>49.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>49.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>49.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>targets</unit>
+                            <min>3</min>
+                        </limit>
+                        <limit>
+                            <unit>misfires</unit>
+                            <max>20</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-monthly">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                    <number>-1</number>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>249.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>149.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>169.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>shells</unit>
+                            <max>200</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="laser-scope-monthly">
+            <product>Laser-Scope</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
 
-	<plans>
-		<plan name="pistol-monthly">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice> <!-- empty price implies $0 -->
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>GBP</currency><value>3.0</value></price>
-					<price><currency>EUR</currency><value>3.0</value></price> 
-					<price><currency>USD</currency><value>3.0</value></price>								
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-monthly">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice></fixedPrice>
-				    <!-- no price implies $0 -->
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-					<number>-1</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>249.95</value></price>								
-					<price><currency>EUR</currency><value>149.95</value></price>
-					<price><currency>GBP</currency><value>169.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>2399.95</value></price>								
-					<price><currency>EUR</currency><value>1499.95</value></price>
-					<price><currency>GBP</currency><value>1699.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-	</plans>
-	<priceLists>
-		<defaultPriceList name="DEFAULT">			
-				<plans>	
-				<plan>pistol-monthly</plan>
-				<plan>shotgun-monthly</plan>
-				<plan>shotgun-annual</plan>
-			</plans>
-		</defaultPriceList>
-	</priceLists>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="extra-ammo-monthly">
+            <product>Extra-Ammo</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+    </plans>
+    <priceLists>
+        <defaultPriceList name="DEFAULT">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>shotgun-annual</plan>
+            </plans>
+        </defaultPriceList>
+    </priceLists>
 </catalog>

diff --git a/catalog/src/test/resources/WeaponsHire.xml b/catalog/src/test/resources/WeaponsHire.xml
index b941c76..90f36a2 100644
--- a/catalog/src/test/resources/WeaponsHire.xml
+++ b/catalog/src/test/resources/WeaponsHire.xml
@@ -37,605 +37,870 @@ Use Cases to do:
 
  -->
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
-	<effectiveDate>2011-10-08T00:00:00+00:00</effectiveDate>
-	<catalogName>Firearms</catalogName>
+    <effectiveDate>2011-10-08T00:00:00+00:00</effectiveDate>
+    <catalogName>Firearms</catalogName>
 
-	<currencies>
-		<currency>USD</currency>
-		<currency>EUR</currency>
-		<currency>GBP</currency>
-	</currencies>
-	
-	<products>
-		<product name="Pistol">
-			<category>BASE</category>
-		</product>
-		<product name="Shotgun">
-			<category>BASE</category>
+    <currencies>
+        <currency>USD</currency>
+        <currency>EUR</currency>
+        <currency>GBP</currency>
+    </currencies>
+
+    <products>
+        <product name="Pistol">
+            <category>BASE</category>
+        </product>
+        <product name="Shotgun">
+            <category>BASE</category>
             <available>
                 <addonProduct>Telescopic-Scope</addonProduct>
                 <addonProduct>Laser-Scope</addonProduct>
             </available>
-		</product>
-		<product name="Assault-Rifle">
-			<category>BASE</category>
-			<included> 
-				<addonProduct>Telescopic-Scope</addonProduct>
-			</included>
-			<available>
-				<addonProduct>Laser-Scope</addonProduct>
-			</available>
-		</product>
-		<product name="Telescopic-Scope">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Laser-Scope">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Holster">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Extra-Ammo">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Refurbish-Maintenance">
-			<category>ADD_ON</category>
-		</product>
-	</products>
-	 
-	<rules>
-		<changePolicy>
-			<changePolicyCase> 
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>
-            <changePolicyCase> 
+        </product>
+        <product name="Assault-Rifle">
+            <category>BASE</category>
+            <included>
+                <addonProduct>Telescopic-Scope</addonProduct>
+            </included>
+            <available>
+                <addonProduct>Laser-Scope</addonProduct>
+            </available>
+        </product>
+        <product name="Telescopic-Scope">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Laser-Scope">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Holster">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Extra-Ammo">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Refurbish-Maintenance">
+            <category>ADD_ON</category>
+        </product>
+    </products>
+
+    <rules>
+        <changePolicy>
+            <changePolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+            <changePolicyCase>
                 <toProduct>Assault-Rifle</toProduct>
                 <policy>IMMEDIATE</policy>
             </changePolicyCase>
-            <changePolicyCase> 
-                <fromProduct>Pistol</fromProduct>            
+            <changePolicyCase>
+                <fromProduct>Pistol</fromProduct>
                 <toProduct>Shotgun</toProduct>
                 <policy>IMMEDIATE</policy>
             </changePolicyCase>
-			<changePolicyCase> 
-				<toPriceList>rescue</toPriceList>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-			<changePolicyCase> 
-				<fromBillingPeriod>MONTHLY</fromBillingPeriod>
-				<toBillingPeriod>ANNUAL</toBillingPeriod>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>
-			<changePolicyCase> 
-				<fromBillingPeriod>ANNUAL</fromBillingPeriod>
-				<toBillingPeriod>MONTHLY</toBillingPeriod>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-			<changePolicyCase> 
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-		</changePolicy>
-		<changeAlignment>
-			<changeAlignmentCase>
-				<toPriceList>rescue</toPriceList>
-				<alignment>CHANGE_OF_PLAN</alignment>
-			</changeAlignmentCase>
-			<changeAlignmentCase>
-				<fromPriceList>rescue</fromPriceList>
-				<toPriceList>rescue</toPriceList>
-				<alignment>CHANGE_OF_PRICELIST</alignment>
-			</changeAlignmentCase>
+            <changePolicyCase>
+                <toPriceList>rescue</toPriceList>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <fromBillingPeriod>MONTHLY</fromBillingPeriod>
+                <toBillingPeriod>ANNUAL</toBillingPeriod>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <fromBillingPeriod>ANNUAL</fromBillingPeriod>
+                <toBillingPeriod>MONTHLY</toBillingPeriod>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+        </changePolicy>
+        <changeAlignment>
+            <changeAlignmentCase>
+                <toPriceList>rescue</toPriceList>
+                <alignment>CHANGE_OF_PLAN</alignment>
+            </changeAlignmentCase>
+            <changeAlignmentCase>
+                <fromPriceList>rescue</fromPriceList>
+                <toPriceList>rescue</toPriceList>
+                <alignment>CHANGE_OF_PRICELIST</alignment>
+            </changeAlignmentCase>
             <changeAlignmentCase>
                 <alignment>START_OF_SUBSCRIPTION</alignment>
             </changeAlignmentCase>
-		</changeAlignment>
-		<cancelPolicy>
-			<cancelPolicyCase>
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</cancelPolicyCase>
+        </changeAlignment>
+        <cancelPolicy>
+            <cancelPolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </cancelPolicyCase>
             <cancelPolicyCase>
                 <policy>END_OF_TERM</policy>
             </cancelPolicyCase>
-		</cancelPolicy>
-		<createAlignment>
-		    <createAlignmentCase>
-		        <product>Laser-Scope</product>
+        </cancelPolicy>
+        <createAlignment>
+            <createAlignmentCase>
+                <product>Laser-Scope</product>
                 <alignment>START_OF_SUBSCRIPTION</alignment>
             </createAlignmentCase>
             <createAlignmentCase>
                 <alignment>START_OF_BUNDLE</alignment>
             </createAlignmentCase>
-		</createAlignment>
-		<billingAlignment>
-		<billingAlignmentCase>
-			<alignment>ACCOUNT</alignment>
-		</billingAlignmentCase>
-			<billingAlignmentCase>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<alignment>SUBSCRIPTION</alignment>
-			</billingAlignmentCase>
-			<billingAlignmentCase>
-				<productCategory>ADD_ON</productCategory>
-				<alignment>BUNDLE</alignment>
-			</billingAlignmentCase>
-		</billingAlignment>
-		<priceList>
-			<priceListCase>
-				<fromPriceList>rescue</fromPriceList>
-				<toPriceList>DEFAULT</toPriceList>
-			</priceListCase>
-		</priceList>
-	</rules> 
-	
-	<plans>
-		<plan name="pistol-monthly">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice> <!-- empty price implies $0 -->
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>GBP</currency><value>29.95</value></price>
-					<price><currency>EUR</currency><value>29.95</value></price> 
-					<price><currency>USD</currency><value>29.95</value></price>								
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-monthly">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice></fixedPrice>
-				    <!-- no price implies $0 -->
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-					<number>-1</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>249.95</value></price>								
-					<price><currency>EUR</currency><value>149.95</value></price>
-					<price><currency>GBP</currency><value>169.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-monthly">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>599.95</value></price>								
-					<price><currency>EUR</currency><value>349.95</value></price>
-					<price><currency>GBP</currency><value>399.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="pistol-annual">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>199.95</value></price>								
-					<price><currency>EUR</currency><value>199.95</value></price>
-					<price><currency>GBP</currency><value>199.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>2399.95</value></price>								
-					<price><currency>EUR</currency><value>1499.95</value></price>
-					<price><currency>GBP</currency><value>1699.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-annual">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>5999.95</value></price>								
-					<price><currency>EUR</currency><value>3499.95</value></price>
-					<price><currency>GBP</currency><value>3999.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="pistol-annual-gunclub-discount">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>6</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price><currency>USD</currency><value>9.95</value></price>								
-						<price><currency>EUR</currency><value>9.95</value></price>
-						<price><currency>GBP</currency><value>9.95</value></price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>199.95</value></price>								
-					<price><currency>EUR</currency><value>199.95</value></price>
-					<price><currency>GBP</currency><value>199.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual-gunclub-discount">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>6</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price><currency>USD</currency><value>19.95</value></price>								
-						<price><currency>EUR</currency><value>49.95</value></price>
-						<price><currency>GBP</currency><value>69.95</value></price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>2399.95</value></price>								
-					<price><currency>EUR</currency><value>1499.95</value></price>
-					<price><currency>GBP</currency><value>1699.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-annual-gunclub-discount">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>6</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price><currency>USD</currency><value>99.95</value></price>								
-						<price><currency>EUR</currency><value>99.95</value></price>
-						<price><currency>GBP</currency><value>99.95</value></price>
-						</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>5999.95</value></price>								
-					<price><currency>EUR</currency><value>3499.95</value></price>
-					<price><currency>GBP</currency><value>3999.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="laser-scope-monthly">
-		<product>Laser-Scope</product>
-           <initialPhases>
-              <phase type="DISCOUNT">
-                 <duration>
-                    <unit>MONTHS</unit>
-                    <number>1</number>
-                  </duration>
-                 <billingPeriod>MONTHLY</billingPeriod>
+        </createAlignment>
+        <billingAlignment>
+            <billingAlignmentCase>
+                <alignment>ACCOUNT</alignment>
+            </billingAlignmentCase>
+            <billingAlignmentCase>
+                <billingPeriod>ANNUAL</billingPeriod>
+                <alignment>SUBSCRIPTION</alignment>
+            </billingAlignmentCase>
+            <billingAlignmentCase>
+                <productCategory>ADD_ON</productCategory>
+                <alignment>BUNDLE</alignment>
+            </billingAlignmentCase>
+        </billingAlignment>
+        <priceList>
+            <priceListCase>
+                <fromPriceList>rescue</fromPriceList>
+                <toPriceList>DEFAULT</toPriceList>
+            </priceListCase>
+        </priceList>
+    </rules>
+
+    <plans>
+        <plan name="pistol-monthly">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
-                      <price><currency>USD</currency><value>999.95</value></price>                             
-                      <price><currency>EUR</currency><value>499.95</value></price>
-                      <price><currency>GBP</currency><value>999.95</value></price>
-                      </recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>29.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-monthly">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>1999.95</value></price>								
-					<price><currency>EUR</currency><value>1499.95</value></price>
-					<price><currency>GBP</currency><value>1999.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="telescopic-scope-monthly">
-			<product>Telescopic-Scope</product>
-			<initialPhases>
-              <phase type="DISCOUNT">
-                 <duration>
-                    <unit>MONTHS</unit>
-                    <number>1</number>
-                  </duration>
-                 <billingPeriod>MONTHLY</billingPeriod>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                    <number>-1</number>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
-                      <price><currency>USD</currency><value>399.95</value></price>                             
-                      <price><currency>EUR</currency><value>299.95</value></price>
-                      <price><currency>GBP</currency><value>399.95</value></price>
-                      </recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>249.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>149.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>169.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-monthly">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>999.95</value></price>								
-					<price><currency>EUR</currency><value>499.95</value></price>
-					<price><currency>GBP</currency><value>999.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="extra-ammo-monthly">
-			<product>Extra-Ammo</product>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>999.95</value></price>								
-					<price><currency>EUR</currency><value>499.95</value></price>
-					<price><currency>GBP</currency><value>999.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-			<plansAllowedInBundle>-1</plansAllowedInBundle> <!-- arbitrary number of these (multipack) -->
-		</plan>
-		<plan name="holster-monthly-regular">
-			<product>Holster</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>199.95</value></price>								
-					<price><currency>EUR</currency><value>199.95</value></price>
-					<price><currency>GBP</currency><value>199.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="holster-monthly-special">
-			<product>Holster</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>199.95</value></price>								
-					<price><currency>EUR</currency><value>199.95</value></price>
-					<price><currency>GBP</currency><value>199.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-annual-rescue">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>YEARS</unit>
-						<number>1</number>
-					</duration>
-					<billingPeriod>ANNUAL</billingPeriod>
-					<recurringPrice>
-						<price><currency>USD</currency><value>5999.95</value></price>								
-						<price><currency>EUR</currency><value>3499.95</value></price>
-						<price><currency>GBP</currency><value>3999.95</value></price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>5999.95</value></price>								
-					<price><currency>EUR</currency><value>3499.95</value></price>
-					<price><currency>GBP</currency><value>3999.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="refurbish-maintenance">
-			<product>Refurbish-Maintenance</product>
-			<finalPhase type="FIXEDTERM">
-				<duration>
-					<unit>MONTHS</unit>
-					<number>12</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>199.95</value></price>								
-					<price><currency>EUR</currency><value>199.95</value></price>
-					<price><currency>GBP</currency><value>199.95</value></price>
-				</recurringPrice>
-				<fixedPrice>
-					<price><currency>USD</currency><value>599.95</value></price>								
-					<price><currency>EUR</currency><value>599.95</value></price>
-					<price><currency>GBP</currency><value>599.95</value></price>
-				</fixedPrice>
-			</finalPhase>
-		</plan>
-	</plans>
-	<priceLists>
-		<defaultPriceList name="DEFAULT"> 
-			<plans>
-				<plan>pistol-monthly</plan>
-				<plan>shotgun-monthly</plan>
-				<plan>assault-rifle-monthly</plan>
-				<plan>pistol-annual</plan>
-				<plan>shotgun-annual</plan>
-				<plan>assault-rifle-annual</plan>
-				<plan>laser-scope-monthly</plan>
-				<plan>telescopic-scope-monthly</plan>
-				<plan>extra-ammo-monthly</plan>
-				<plan>holster-monthly-regular</plan>
-				<plan>refurbish-maintenance</plan>
-			</plans>
-		</defaultPriceList>
-		<childPriceList name="gunclubDiscount">
-			<plans>
-				<plan>pistol-monthly</plan>
-				<plan>shotgun-monthly</plan>
-				<plan>assault-rifle-monthly</plan>
-				<plan>pistol-annual-gunclub-discount</plan>
-				<plan>shotgun-annual-gunclub-discount</plan>
-				<plan>assault-rifle-annual-gunclub-discount</plan>
-				<plan>holster-monthly-special</plan>
-			</plans>
-		</childPriceList>
-		<childPriceList name="rescue">
-			<plans>
-				<plan>assault-rifle-annual-rescue</plan>
-			</plans>
-		</childPriceList>
-	</priceLists>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>349.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>399.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="pistol-annual">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-annual">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>5999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>3499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>3999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="pistol-annual-gunclub-discount">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>6</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>9.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>9.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>9.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual-gunclub-discount">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>6</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>19.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>49.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>69.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-annual-gunclub-discount">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>6</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>99.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>99.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>99.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>5999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>3499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>3999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="laser-scope-monthly">
+            <product>Laser-Scope</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>999.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>499.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>999.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="telescopic-scope-monthly">
+            <product>Telescopic-Scope</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>399.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>299.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>399.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="extra-ammo-monthly">
+            <product>Extra-Ammo</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+            <plansAllowedInBundle>-1</plansAllowedInBundle>
+            <!-- arbitrary number of these (multipack) -->
+        </plan>
+        <plan name="holster-monthly-regular">
+            <product>Holster</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="holster-monthly-special">
+            <product>Holster</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-annual-rescue">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>YEARS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>ANNUAL</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>5999.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>3499.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>3999.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>5999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>3499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>3999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="refurbish-maintenance">
+            <product>Refurbish-Maintenance</product>
+            <finalPhase type="FIXEDTERM">
+                <duration>
+                    <unit>MONTHS</unit>
+                    <number>12</number>
+                </duration>
+                <fixed>
+                    <fixedPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>599.95</value>
+                        </price>
+                    </fixedPrice>
+                </fixed>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+    </plans>
+    <priceLists>
+        <defaultPriceList name="DEFAULT">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>assault-rifle-monthly</plan>
+                <plan>pistol-annual</plan>
+                <plan>shotgun-annual</plan>
+                <plan>assault-rifle-annual</plan>
+                <plan>laser-scope-monthly</plan>
+                <plan>telescopic-scope-monthly</plan>
+                <plan>extra-ammo-monthly</plan>
+                <plan>holster-monthly-regular</plan>
+                <plan>refurbish-maintenance</plan>
+            </plans>
+        </defaultPriceList>
+        <childPriceList name="gunclubDiscount">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>assault-rifle-monthly</plan>
+                <plan>pistol-annual-gunclub-discount</plan>
+                <plan>shotgun-annual-gunclub-discount</plan>
+                <plan>assault-rifle-annual-gunclub-discount</plan>
+                <plan>holster-monthly-special</plan>
+            </plans>
+        </childPriceList>
+        <childPriceList name="rescue">
+            <plans>
+                <plan>assault-rifle-annual-rescue</plan>
+            </plans>
+        </childPriceList>
+    </priceLists>
 
 </catalog>

diff --git a/catalog/src/test/resources/WeaponsHireSmall.xml b/catalog/src/test/resources/WeaponsHireSmall.xml
index 5b43feb..365cf11 100644
--- a/catalog/src/test/resources/WeaponsHireSmall.xml
+++ b/catalog/src/test/resources/WeaponsHireSmall.xml
@@ -16,57 +16,57 @@
   -->
 
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
-	<effectiveDate>2011-10-08T00:00:00+00:00</effectiveDate>
-	<catalogName>WeaponsHireSmall</catalogName>
+    <effectiveDate>2011-10-08T00:00:00+00:00</effectiveDate>
+    <catalogName>WeaponsHireSmall</catalogName>
+
+    <currencies>
+        <currency>USD</currency>
+        <currency>EUR</currency>
+        <currency>GBP</currency>
+    </currencies>
 
-	<currencies>
-		<currency>USD</currency>
-		<currency>EUR</currency>
-		<currency>GBP</currency>
-	</currencies>
-    
     <units>
         <unit name="targets"/>
         <unit name="misfires"/>
         <unit name="shells"/>
     </units>
 
-	<products>
-		<product name="Pistol">
-			<category>BASE</category>
-		</product>
-		<product name="Shotgun">
-			<category>BASE</category>
-                <limits>
-                    <limit>
-                        <unit>shells</unit>
-                        <max>300</max>
-                    </limit>
-                </limits>
-		</product>
-		<product name="Laser-Scope">
-			<category>ADD_ON</category>
-		</product>
+    <products>
+        <product name="Pistol">
+            <category>BASE</category>
+        </product>
+        <product name="Shotgun">
+            <category>BASE</category>
+            <limits>
+                <limit>
+                    <unit>shells</unit>
+                    <max>300</max>
+                </limit>
+            </limits>
+        </product>
+        <product name="Laser-Scope">
+            <category>ADD_ON</category>
+        </product>
         <product name="Extra-Ammo">
             <category>ADD_ON</category>
         </product>
-	</products>
-	 
-	<rules>
-		<changePolicy>
-			<changePolicyCase> 
-				<fromBillingPeriod>MONTHLY</fromBillingPeriod>
-				<toProduct>Shotgun</toProduct>
-				<toBillingPeriod>MONTHLY</toBillingPeriod>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-			<changePolicyCase> 
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>	
-		</changePolicy>
+    </products>
+
+    <rules>
+        <changePolicy>
+            <changePolicyCase>
+                <fromBillingPeriod>MONTHLY</fromBillingPeriod>
+                <toProduct>Shotgun</toProduct>
+                <toBillingPeriod>MONTHLY</toBillingPeriod>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+        </changePolicy>
         <changeAlignment>
             <changeAlignmentCase>
                 <alignment>START_OF_SUBSCRIPTION</alignment>
@@ -81,137 +81,200 @@
                 <alignment>START_OF_BUNDLE</alignment>
             </createAlignmentCase>
         </createAlignment>
-	</rules> 
+    </rules>
 
-	<plans>
-		<plan name="pistol-monthly">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice> <!-- empty price implies $0 -->
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>GBP</currency><value>29.95</value></price>
-					<price><currency>EUR</currency><value>29.95</value></price> 
-					<price><currency>USD</currency><value>29.95</value></price>								
-				</recurringPrice>
-                <limits>
-                    <limit>
-                        <unit>targets</unit>
-                        <min>3</min>
-                    </limit>
-                    <limit>
-                        <unit>misfires</unit>
-                        <max>20</max>
-                    </limit>
-                </limits>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-monthly">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice></fixedPrice>
-				    <!-- no price implies $0 -->
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-					<number>-1</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>249.95</value></price>								
-					<price><currency>EUR</currency><value>149.95</value></price>
-					<price><currency>GBP</currency><value>169.95</value></price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price><currency>USD</currency><value>2399.95</value></price>								
-					<price><currency>EUR</currency><value>1499.95</value></price>
-					<price><currency>GBP</currency><value>1699.95</value></price>
-				</recurringPrice>
-                <limits>
-                    <limit>
-                        <unit>shells</unit>
-                        <max>200</max>
-                    </limit>
-                </limits>
-			</finalPhase>
-		</plan>
-		<plan name="laser-scope-monthly">
-        <product>Laser-Scope</product>
+    <plans>
+        <plan name="pistol-monthly">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price><currency>USD</currency><value>1999.95</value></price>                               
-                    <price><currency>EUR</currency><value>1499.95</value></price>
-                    <price><currency>GBP</currency><value>1999.95</value></price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>29.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>targets</unit>
+                            <min>3</min>
+                        </limit>
+                        <limit>
+                            <unit>misfires</unit>
+                            <max>20</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-monthly">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                    <number>-1</number>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>249.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>149.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>169.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                    <!--
+                    <limits>
+                        <limit>
+                            <unit>shells</unit>
+                            <max>200</max>
+                        </limit>
+                    </limits>
+                    -->
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="laser-scope-monthly">
+            <product>Laser-Scope</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="extra-ammo-monthly">
-        <product>Extra-Ammo</product>
+            <product>Extra-Ammo</product>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price><currency>USD</currency><value>1999.95</value></price>                               
-                    <price><currency>EUR</currency><value>1499.95</value></price>
-                    <price><currency>GBP</currency><value>1999.95</value></price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
-	</plans>
-	<priceLists>
-		<defaultPriceList name="DEFAULT">
-				<plans>	
-					<plan>pistol-monthly</plan>
-					<plan>shotgun-monthly</plan>
-				<plan>shotgun-annual</plan>
-			</plans>
-		</defaultPriceList>
-	</priceLists>
+    </plans>
+    <priceLists>
+        <defaultPriceList name="DEFAULT">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>shotgun-annual</plan>
+            </plans>
+        </defaultPriceList>
+    </priceLists>
 </catalog>

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java
index 1e5003d..3ff2055 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java
@@ -559,12 +559,12 @@ public class DefaultSubscriptionBundleTimeline implements SubscriptionBundleTime
                                             in.getPreviousPlan(),
                                             in.getPreviousPhase(),
                                             in.getPreviousPriceList(),
-                                            (in.getPreviousPlan() != null ? in.getPreviousPlan().getBillingPeriod() : null),
+                                            (in.getPreviousPlan() != null ? in.getPreviousPlan().getRecurringBillingPeriod() : null),
                                             (in.getNextPlan() != null ? in.getNextPlan().getProduct() : null),
                                             in.getNextPlan(),
                                             in.getNextPhase(),
                                             in.getNextPriceList(),
-                                            (in.getNextPlan() != null ? in.getNextPlan().getBillingPeriod() : null),
+                                            (in.getNextPlan() != null ? in.getNextPlan().getRecurringBillingPeriod() : null),
                                             in.getCreatedDate(),
                                             accountTimeZone);
     }

diff --git a/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java b/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
index 7229ad8..67b9683 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
@@ -763,9 +763,9 @@ public class TestDefaultInvoiceGenerator extends InvoiceTestSuiteNoDB {
         final Currency currency = Currency.USD;
 
         return invoiceUtil.createMockBillingEvent(null, sub, startDate.toDateTimeAtStartOfDay(), plan, planPhase,
-                                                  planPhase.getFixedPrice() == null ? null : planPhase.getFixedPrice().getPrice(currency),
-                                                  planPhase.getRecurringPrice() == null ? null : planPhase.getRecurringPrice().getPrice(currency),
-                                                  currency, planPhase.getBillingPeriod(),
+                                                  planPhase.getFixed().getPrice() == null ? null : planPhase.getFixed().getPrice().getPrice(currency),
+                                                  planPhase.getRecurring().getRecurringPrice() == null ? null : planPhase.getRecurring().getRecurringPrice().getPrice(currency),
+                                                  currency, planPhase.getRecurring().getBillingPeriod(),
                                                   billCycleDayLocal, BillingModeType.IN_ADVANCE, "Test", 1L, SubscriptionBaseTransitionType.CREATE);
     }
 

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CatalogJsonSimple.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CatalogJsonSimple.java
index 3e63851..31bf18d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CatalogJsonSimple.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CatalogJsonSimple.java
@@ -70,8 +70,8 @@ public class CatalogJsonSimple {
             final List<PhaseJson> phases = new LinkedList<PhaseJson>();
             for (final PlanPhase phase : plan.getAllPhases()) {
                 final List<PriceJson> prices = new LinkedList<PriceJson>();
-                if (phase.getRecurringPrice() != null) {
-                    for (final Price price : phase.getRecurringPrice().getPrices()) {
+                if (phase.getRecurring() != null && phase.getRecurring().getRecurringPrice() != null) {
+                    for (final Price price : phase.getRecurring().getRecurringPrice().getPrices()) {
                         prices.add(new PriceJson(price));
                     }
                 }

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PlanDetailJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PlanDetailJson.java
index 1492b13..5f41dfb 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PlanDetailJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PlanDetailJson.java
@@ -66,11 +66,14 @@ public class PlanDetailJson {
         } else {
             this.productName = plan.getProduct() == null ? null : plan.getProduct().getName();
             this.planName = plan.getName();
-            this.billingPeriod = plan.getBillingPeriod();
-            if (plan.getFinalPhase() == null || plan.getFinalPhase().getRecurringPrice() == null || plan.getFinalPhase().getRecurringPrice().getPrices() == null) {
+            this.billingPeriod = plan.getRecurringBillingPeriod();
+            if (plan.getFinalPhase() == null ||
+                plan.getFinalPhase().getRecurring() == null ||
+                plan.getFinalPhase().getRecurring().getRecurringPrice() == null ||
+                plan.getFinalPhase().getRecurring().getRecurringPrice().getPrices() == null) {
                 this.finalPhasePrice = ImmutableList.<PriceJson>of();
             } else {
-                this.finalPhasePrice = Lists.transform(ImmutableList.<Price>copyOf(plan.getFinalPhase().getRecurringPrice().getPrices()),
+                this.finalPhasePrice = Lists.transform(ImmutableList.<Price>copyOf(plan.getFinalPhase().getRecurring().getRecurringPrice().getPrices()),
                                                        new Function<Price, PriceJson>() {
                                                            @Override
                                                            public PriceJson apply(final Price price) {

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
index 6959a1a..ffecd4a 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
@@ -318,7 +318,7 @@ public class SubscriptionJson extends JsonBase {
         this.startDate = subscription.getEffectiveStartDate();
         this.productName = subscription.getLastActiveProduct().getName();
         this.productCategory = subscription.getLastActiveProductCategory().name();
-        this.billingPeriod = subscription.getLastActivePlan().getBillingPeriod().toString();
+        this.billingPeriod = subscription.getLastActivePlan().getRecurringBillingPeriod().toString();
         this.priceList = subscription.getLastActivePriceList().getName();
         this.cancelledDate = subscription.getEffectiveEndDate();
         this.chargedThroughDate = subscription.getChargedThroughDate();

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
index deee259..c98ecea 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
@@ -214,7 +214,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
                     newEntitlement = current.changePlanOverrideBillingPolicy(entitlement.getProductName(), BillingPeriod.valueOf(entitlement.getBillingPeriod()), entitlement.getPriceList(), inputLocalDate, policy, ctx);
                 }
                 isImmediateOp = newEntitlement.getLastActiveProduct().getName().equals(entitlement.getProductName()) &&
-                                newEntitlement.getLastActivePlan().getBillingPeriod() == BillingPeriod.valueOf(entitlement.getBillingPeriod()) &&
+                                newEntitlement.getLastActivePlan().getRecurringBillingPeriod() == BillingPeriod.valueOf(entitlement.getBillingPeriod()) &&
                                 newEntitlement.getLastActivePriceList().getName().equals(entitlement.getPriceList());
                 return Response.status(Status.OK).build();
             }

diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestPlanDetailJason.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestPlanDetailJason.java
index f15a544..0f2def8 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestPlanDetailJason.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestPlanDetailJason.java
@@ -64,12 +64,12 @@ public class TestPlanDetailJason extends JaxrsTestSuiteNoDB {
 
         final InternationalPrice price = Mockito.mock(InternationalPrice.class);
         final PlanPhase planPhase = Mockito.mock(PlanPhase.class);
-        Mockito.when(planPhase.getRecurringPrice()).thenReturn(price);
+        Mockito.when(planPhase.getRecurring().getRecurringPrice()).thenReturn(price);
 
         final Plan plan = Mockito.mock(Plan.class);
         Mockito.when(plan.getProduct()).thenReturn(product);
         Mockito.when(plan.getName()).thenReturn(UUID.randomUUID().toString());
-        Mockito.when(plan.getBillingPeriod()).thenReturn(BillingPeriod.QUARTERLY);
+        Mockito.when(plan.getRecurringBillingPeriod()).thenReturn(BillingPeriod.QUARTERLY);
         Mockito.when(plan.getFinalPhase()).thenReturn(planPhase);
 
         final PriceList priceList = Mockito.mock(PriceList.class);
@@ -79,11 +79,11 @@ public class TestPlanDetailJason extends JaxrsTestSuiteNoDB {
         Mockito.when(listing.getPlan()).thenReturn(plan);
         Mockito.when(listing.getPriceList()).thenReturn(priceList);
 
-        final PlanDetailJson planDetailJason = new PlanDetailJson(listing);
-        Assert.assertEquals(planDetailJason.getProductName(), plan.getProduct().getName());
-        Assert.assertEquals(planDetailJason.getPlanName(), plan.getName());
-        Assert.assertEquals(planDetailJason.getBillingPeriod(), plan.getBillingPeriod());
-        Assert.assertEquals(planDetailJason.getPriceListName(), priceList.getName());
-        Assert.assertEquals(planDetailJason.getFinalPhasePrice().size(), 0);
+        final PlanDetailJson planDetailJson = new PlanDetailJson(listing);
+        Assert.assertEquals(planDetailJson.getProductName(), plan.getProduct().getName());
+        Assert.assertEquals(planDetailJson.getPlanName(), plan.getName());
+        Assert.assertEquals(planDetailJson.getBillingPeriod(), plan.getRecurringBillingPeriod());
+        Assert.assertEquals(planDetailJson.getPriceListName(), priceList.getName());
+        Assert.assertEquals(planDetailJson.getFinalPhasePrice().size(), 0);
     }
 }

diff --git a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/BillCycleDayCalculator.java b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/BillCycleDayCalculator.java
index dd33853..4cdfd36 100644
--- a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/BillCycleDayCalculator.java
+++ b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/BillCycleDayCalculator.java
@@ -20,6 +20,7 @@ import java.util.List;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
+import org.killbill.billing.catalog.api.BillingPeriod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,10 +76,11 @@ public class BillCycleDayCalculator {
 
         final PlanPhase phase = (transition.getTransitionType() != SubscriptionBaseTransitionType.CANCEL) ? nextPhase : prevPhase;
 
+        final BillingPeriod billingPeriod = phase.getRecurring() != null ? phase.getRecurring().getBillingPeriod() : BillingPeriod.NO_BILLING_PERIOD;
         final BillingAlignment alignment = catalog.billingAlignment(
                 new PlanPhaseSpecifier(product.getName(),
                                        product.getCategory(),
-                                       phase.getBillingPeriod(),
+                                       billingPeriod,
                                        transition.getNextPriceList(),
                                        phase.getPhaseType()),
                 transition.getRequestedTransitionTime());

diff --git a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java
index 10fea39..faf7fbd 100644
--- a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java
+++ b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java
@@ -18,6 +18,8 @@ package org.killbill.billing.junction.plumbing.billing;
 
 import java.math.BigDecimal;
 
+import javax.annotation.Nullable;
+
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 
@@ -72,19 +74,19 @@ public class DefaultBillingEvent implements BillingEvent {
         final PlanPhase prevPhase = (prevPhaseName != null) ? catalog.findPhase(prevPhaseName, transition.getEffectiveTransitionTime(), transition.getSubscriptionStartDate()) : null;
 
 
-        fixedPrice = (nextPhase != null && nextPhase.getFixedPrice() != null) ? nextPhase.getFixedPrice().getPrice(currency) : null;
-        recurringPrice = (nextPhase != null && nextPhase.getRecurringPrice() != null) ? nextPhase.getRecurringPrice().getPrice(currency) : null;
+        fixedPrice = getFixedPrice(nextPhase, currency);
+        recurringPrice = getRecurringPrice(nextPhase, currency);
 
         this.currency = currency;
         description = transition.getTransitionType().toString();
         billingModeType = BillingModeType.IN_ADVANCE;
-        billingPeriod = (transition.getTransitionType() != SubscriptionBaseTransitionType.CANCEL) ?
-                nextPhase.getBillingPeriod() : prevPhase.getBillingPeriod();
+        billingPeriod = getRecurringBillingPeriod((transition.getTransitionType() != SubscriptionBaseTransitionType.CANCEL) ? nextPhase : prevPhase);
         type = transition.getTransitionType();
         totalOrdering = transition.getTotalOrdering();
         timeZone = account.getTimeZone();
     }
 
+
     public DefaultBillingEvent(final Account account, final SubscriptionBase subscription, final DateTime effectiveDate, final Plan plan, final PlanPhase planPhase,
                                final BigDecimal fixedPrice, final BigDecimal recurringPrice, final Currency currency,
                                final BillingPeriod billingPeriod, final int billCycleDayLocal, final BillingModeType billingModeType,
@@ -322,4 +324,19 @@ public class DefaultBillingEvent implements BillingEvent {
     public DateTimeZone getTimeZone() {
         return timeZone;
     }
+
+    private BigDecimal getFixedPrice(@Nullable final PlanPhase nextPhase, final Currency currency) throws CatalogApiException {
+        return (nextPhase != null && nextPhase.getFixed() != null && nextPhase.getFixed().getPrice() != null) ? nextPhase.getFixed().getPrice().getPrice(currency) : null;
+    }
+
+    private BigDecimal getRecurringPrice(@Nullable final PlanPhase nextPhase, final Currency currency) throws CatalogApiException {
+        return (nextPhase != null && nextPhase.getRecurring() != null && nextPhase.getRecurring().getRecurringPrice() != null) ? nextPhase.getRecurring().getRecurringPrice().getPrice(currency) : null;
+    }
+
+    private BillingPeriod getRecurringBillingPeriod(@Nullable final PlanPhase nextPhase) {
+        if (nextPhase == null) {
+            return BillingPeriod.NO_BILLING_PERIOD;
+        }
+        return nextPhase.getRecurring() != null ? nextPhase.getRecurring().getBillingPeriod() : BillingPeriod.NO_BILLING_PERIOD;
+    }
 }

diff --git a/junction/src/test/java/org/killbill/billing/junction/plumbing/billing/TestBillingApi.java b/junction/src/test/java/org/killbill/billing/junction/plumbing/billing/TestBillingApi.java
index 9d677a4..bcb4cd0 100644
--- a/junction/src/test/java/org/killbill/billing/junction/plumbing/billing/TestBillingApi.java
+++ b/junction/src/test/java/org/killbill/billing/junction/plumbing/billing/TestBillingApi.java
@@ -189,9 +189,9 @@ public class TestBillingApi extends JunctionTestSuiteNoDB {
         Assert.assertEquals(events.size(), 3);
         final Iterator<BillingEvent> it = events.iterator();
 
-        checkEvent(it.next(), nextPlan, account.getBillCycleDayLocal(), subId, now, nextPhase, SubscriptionBaseTransitionType.CREATE.toString(), nextPhase.getFixedPrice(), nextPhase.getRecurringPrice());
+        checkEvent(it.next(), nextPlan, account.getBillCycleDayLocal(), subId, now, nextPhase, SubscriptionBaseTransitionType.CREATE.toString(), nextPhase.getFixed().getPrice(), nextPhase.getRecurring().getRecurringPrice());
         checkEvent(it.next(), nextPlan, account.getBillCycleDayLocal(), subId, now.plusDays(1), nextPhase, SubscriptionBaseTransitionType.START_BILLING_DISABLED.toString(), null, null);
-        checkEvent(it.next(), nextPlan, account.getBillCycleDayLocal(), subId, now.plusDays(2), nextPhase, SubscriptionBaseTransitionType.END_BILLING_DISABLED.toString(), nextPhase.getFixedPrice(), nextPhase.getRecurringPrice());
+        checkEvent(it.next(), nextPlan, account.getBillCycleDayLocal(), subId, now.plusDays(2), nextPhase, SubscriptionBaseTransitionType.END_BILLING_DISABLED.toString(), nextPhase.getFixed().getPrice(), nextPhase.getRecurring().getRecurringPrice());
     }
 
     @Test(groups = "fast")
@@ -230,7 +230,7 @@ public class TestBillingApi extends JunctionTestSuiteNoDB {
     private void checkFirstEvent(final SortedSet<BillingEvent> events, final Plan nextPlan,
                                  final int BCD, final UUID id, final DateTime time, final PlanPhase nextPhase, final String desc) throws CatalogApiException {
         Assert.assertEquals(events.size(), 1);
-        checkEvent(events.first(), nextPlan, BCD, id, time, nextPhase, desc, nextPhase.getFixedPrice(), nextPhase.getRecurringPrice());
+        checkEvent(events.first(), nextPlan, BCD, id, time, nextPhase, desc, nextPhase.getFixed().getPrice(), nextPhase.getRecurring().getRecurringPrice());
     }
 
     private void checkEvent(final BillingEvent event, final Plan nextPlan, final int BCD, final UUID id, final DateTime time,
@@ -253,7 +253,7 @@ public class TestBillingApi extends JunctionTestSuiteNoDB {
         Assert.assertEquals(nextPhase, event.getPlanPhase());
         Assert.assertEquals(nextPlan, event.getPlan());
         if (!SubscriptionBaseTransitionType.START_BILLING_DISABLED.equals(event.getTransitionType())) {
-            Assert.assertEquals(nextPhase.getBillingPeriod(), event.getBillingPeriod());
+            Assert.assertEquals(nextPhase.getRecurring().getBillingPeriod(), event.getBillingPeriod());
         }
         Assert.assertEquals(BillingModeType.IN_ADVANCE, event.getBillingMode());
         Assert.assertEquals(desc, event.getTransitionType().toString());

diff --git a/osgi-bundles/bundles/logger/pom.xml b/osgi-bundles/bundles/logger/pom.xml
index d4bd15b..cc6442a 100644
--- a/osgi-bundles/bundles/logger/pom.xml
+++ b/osgi-bundles/bundles/logger/pom.xml
@@ -56,7 +56,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Activator>org.killbill.billing.osgi.bundles.logger.Activator</Bundle-Activator>
-                        <Export-Package />
+                        <Export-Package></Export-Package>
                         <Private-Package>org.killbill.billing.osgi.bundles.logger.*</Private-Package>
                         <!-- Optional resolution because exported by the Felix system bundle -->
                         <Import-Package>*;resolution:=optional</Import-Package>

diff --git a/pom.xml b/pom.xml
index 14137c0..45ea3bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.5.29</version>
+        <version>0.5.30-usage</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.9.2-SNAPSHOT</version>

diff --git a/server/bitcoin.log b/server/bitcoin.log
new file mode 100644
index 0000000..551858b
--- /dev/null
+++ b/server/bitcoin.log
@@ -0,0 +1,1037 @@
+4049 [WalletAppKit STARTING] INFO  c.g.bitcoin.core.AbstractBlockChain - chain head is at height 278446:
+v2 block: 
+   previous block: 00000000000000008790f50f88c04e640e644169c16ee47bd25849b566965ed3
+   merkle root: 7ea51c615a3c7cf6563ac671d3865f0501abafad7e55d2be559a906339754e3d
+   time: [1388764030] Fri Jan 03 15:47:10 UTC 2014
+   difficulty target (nBits): 419628831
+   nonce: 1111874632
+
+4143 [WalletAppKit STARTING] WARN  c.g.bitcoin.core.AbstractBlockChain - Wallet/chain height mismatch: 278443 vs 278446
+4143 [WalletAppKit STARTING] WARN  c.g.bitcoin.core.AbstractBlockChain - Hashes: 0000000000000002817bc24f6dc6641dcb1e57302c363be395054323679dbab0 vs 000000000000000059225b59ded12462c765be2381f4f9fc1590fd410f886813
+4579 [PeerGroup STARTING] INFO  com.google.bitcoin.core.PeerGroup - Peer discovery took 426msec
+4812 [New I/O worker #3] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bitcoin.dashjr.org/24.224.241.163:8333 as: /BitCoinJ:0.10.3/
+4901 [New I/O worker #2] INFO  c.g.b.core.TCPNetworkConnection - Announcing to seed.bitcoin.sipa.be/77.194.32.177:8333 as: /BitCoinJ:0.10.3/
+4905 [New I/O worker #4] INFO  c.g.b.core.TCPNetworkConnection - Announcing to seed.bitcoin.sipa.be/89.235.245.35:8333 as: /BitCoinJ:0.10.3/
+5002 [New I/O worker #3] INFO  c.g.b.core.TCPNetworkConnection - Connected to 24.224.241.163: version=70001, subVer='/Satoshi:0.8.5/', services=0x1, time=Tue Jan 07 00:32:37 UTC 2014, blocks=279018
+5147 [New I/O worker #3] INFO  com.google.bitcoin.core.PeerGroup - [24.224.241.163]:8333: New peer
+5148 [New I/O worker #3] INFO  com.google.bitcoin.core.PeerGroup - Setting download peer: [24.224.241.163]:8333
+5149 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Downloading block chain of size 572. 
+5189 [New I/O worker #4] INFO  c.g.b.core.TCPNetworkConnection - Connected to 89.235.245.35: version=70001, subVer='/Satoshi:0.8.5/', services=0x1, time=Tue Jan 07 00:32:46 UTC 2014, blocks=279018
+5258 [New I/O worker #2] INFO  c.g.b.core.TCPNetworkConnection - Connected to 77.194.32.177: version=70001, subVer='/Satoshi:0.8.5/', services=0x1, time=Tue Jan 07 00:32:39 UTC 2014, blocks=279018
+5474 [New I/O worker #4] INFO  com.google.bitcoin.core.PeerGroup - [89.235.245.35]:8333: New peer
+5501 [New I/O worker #2] INFO  com.google.bitcoin.core.PeerGroup - [77.194.32.177]:8333: New peer
+6659 [New I/O worker #1] INFO  com.google.bitcoin.core.PeerGroup - [101.28.51.40]:8333: Peer died
+6660 [New I/O boss #17] INFO  com.google.bitcoin.core.Peer - [101.28.51.40]:8333 - connection timed out
+6661 [New I/O worker #1] INFO  com.google.bitcoin.core.Peer - [2001:470:c1f2:3:0:0:0:201]:8333 - No route to host
+6661 [New I/O worker #5] INFO  com.google.bitcoin.core.PeerGroup - [2001:470:c1f2:3:0:0:0:201]:8333: Peer died
+6845 [New I/O worker #6] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bluematt.me/130.180.122.103:8333 as: /BitCoinJ:0.10.3/
+7029 [New I/O worker #6] INFO  com.google.bitcoin.core.PeerGroup - [130.180.122.103]:8333: Peer died
+7145 [New I/O worker #7] INFO  c.g.b.core.TCPNetworkConnection - Announcing to seed.bitcoin.sipa.be/209.6.90.175:8333 as: /BitCoinJ:0.10.3/
+7685 [New I/O worker #7] INFO  c.g.b.core.TCPNetworkConnection - Connected to 209.6.90.175: version=70001, subVer='/Satoshi:0.8.5/', services=0x1, time=Tue Jan 07 00:32:34 UTC 2014, blocks=279018
+7781 [New I/O worker #7] INFO  com.google.bitcoin.core.PeerGroup - [209.6.90.175]:8333: New peer
+12524 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278447/0000000000000001f2b9d6ab41eeb5b3f5a0d2bd28b13a28d225fe75138ebe39
+12532 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 8msec
+18072 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278448/0000000000000000adda2cd466b3e842c8f29a0a5771453caeba8072cc27863e
+18074 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+21933 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278449/0000000000000000f87a3718ab93223763ec52e262de43de20442ac237ebc98f
+21934 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+24105 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278450/0000000000000001da1455a71d9c0d7a7d3d3a2c3cf9ae98e631eb706ade7850
+24106 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+26281 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 1% done with 566 blocks to go, block date Jan 3, 2014 4:27:11 PM
+26916 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278452/00000000000000028186b790f5e3f9f227cf46a0a87afa28bd6cf4ec5db37cfa
+26918 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+31261 [New I/O worker #3] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+32272 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278453/000000000000000125cada0da30d51968f6bc245cc3f6b166e72830b18f70d21
+32274 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+36674 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278454/00000000000000022423af9a2ccbf0c6aae0bb9928d218c5d90fae38d5239d56
+36676 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+44803 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278456/000000000000000073934fc5e0cc024c1148f48c42a5375cafac308851010b62
+44805 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+47294 [New I/O worker #3] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+48303 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278457/0000000000000000e4d05b920abfd26d4fc2ffd69461d1277b1b9b8743c2589c
+48305 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+51597 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 2% done with 560 blocks to go, block date Jan 3, 2014 5:59:40 PM
+52597 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278458/0000000000000002c85e89367dfc9ca8e99eabcc4a4506b01bb29ffc2e86803a
+52599 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+54067 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278459/00000000000000010f887125c7038b86d92e6e0220f51651fe52b619d171d340
+54069 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+58075 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278460/000000000000000228229603ad6fe1e53b2cc4e775ce568f55676675c32e624d
+58077 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+63283 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278461/0000000000000000989156693a0869aa8851d9cf0e42e9a8cc1e8d49c7c1863e
+63285 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+79365 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278462/0000000000000001bafe98f5292b38260f3638507987284a032cb051a5ccf92b
+79367 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+84441 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278463/00000000000000028b3965f9c0c8050e06b4a5162281637655776fc775ad9b9c
+84442 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+87063 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 3% done with 554 blocks to go, block date Jan 3, 2014 6:36:22 PM
+88064 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278464/0000000000000001172229723a9ff7372bd28f4bf6f6b18838171a900ed314dc
+88066 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+94110 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278465/0000000000000000d26797cd1b2309bdd283e66fb31ea467cda5e6ab766a710a
+94112 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+95399 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278466/0000000000000000da80bd741e04ca7cc542c30fada703cd9331878ca48ac1e4
+95400 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+102456 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278467/00000000000000022a44ac62a13dba49fa5b8c56c329b109592402718452fa27
+102458 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+105997 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278468/00000000000000002f35b44287aedc97bfe6495cc536c84b421540d4d154cf43
+105999 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+107458 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 4% done with 549 blocks to go, block date Jan 3, 2014 7:11:59 PM
+108459 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278470/0000000000000000d576b2a8a8313fa7747a4d25eda56f1c2d7d6052f99daaea
+108461 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+111435 [New I/O worker #3] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+112438 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278471/000000000000000058a51e46fae8afdae604e1bf650477da16d93069e5bbeaa3
+112440 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+115096 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278472/0000000000000003002c57cf58926e63c93e521bf2134bf5afb7b29cf5ca6c57
+115097 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+118780 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278473/0000000000000002e0d156e32586074ab6cc0fdbb1a05d5cda168510c43e9a50
+118782 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+122352 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278474/0000000000000002e40b2dc429d3d19c2cd9c995547da97d9f3d0f68e60914a9
+122353 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+122659 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 5% done with 543 blocks to go, block date Jan 3, 2014 7:43:39 PM
+123659 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278475/0000000000000001b41ef8e9954b56aa05a2640d4a5c0344d705bf0e44ee141a
+123661 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+126019 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278476/000000000000000031da8aa8b98a646c4aed54c700f717a8553297038e8062f9
+126021 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+131150 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278477/00000000000000026234b1e446ee4aff695d86fb874578d4f0e116baa70a7af0
+131151 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+132298 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278479/0000000000000003065f32da26de1deda93eb722bf1dc4a1b787e7d68d282dbc
+132299 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+138977 [New I/O worker #3] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+139982 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278480/00000000000000019141fc5ef7f2af078c2a8340bd9b7924c46e3860811f7a2f
+139983 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+144494 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 6% done with 537 blocks to go, block date Jan 3, 2014 8:43:40 PM
+145494 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278481/00000000000000020eb97bc2775390d01243e497735ea12f6620a7a3310e3ae1
+145496 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+151338 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278482/0000000000000002b3a3aaf1afe5dc3f0b543c20bb03347d5e2ffc09f1fc34e3
+151340 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+152990 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278483/000000000000000251d8c6bb4f73d2f68e359fe143dfd3645374a4d26d09388c
+152992 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+159221 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278484/000000000000000238d73c9a721a1fbdc38c08ed1797011d17459fe62d275035
+159222 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+160599 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278485/0000000000000000122e1dbc5ade3a86d6ad32e52811ccdf5ce3c5ca72f437ce
+160601 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+172124 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278486/00000000000000010ba6426b6397347298edf260dab8a90de0384d2c672a930a
+172125 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+174203 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 7% done with 531 blocks to go, block date Jan 3, 2014 10:25:56 PM
+175204 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278487/0000000000000001537dba2ce1f76e60db366e160f052da3e15e748be45cc45e
+175205 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+177725 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278488/0000000000000002bc93b18f0e64d6f882fe93bebdae23891e8d8759922b5607
+177727 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+183422 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278489/000000000000000195d9b7f80bc006ab4eb182dc26c85a4b8b62ae4f26a4696a
+183423 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+188159 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278490/0000000000000001d52c08e2d19762d8b11103f867535197c273a4b79bbeb5af
+188161 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+193331 [New I/O worker #3] INFO  c.g.bitcoin.core.DownloadListener - Chain download 8% done with 526 blocks to go, block date Jan 3, 2014 11:02:54 PM
+193612 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278492/00000000000000008d604383ddb6aeb3775a7fde1dd321adf194545cfe32ca8e
+193613 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+199756 [New I/O worker #3] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+200761 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278493/00000000000000007488b530a2c208f8e1528b71c151a75a34d29fcfe0687c55
+200762 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+4014 [WalletAppKit STARTING] INFO  c.g.bitcoin.core.AbstractBlockChain - chain head is at height 278493:
+v2 block: 
+   previous block: 00000000000000008d604383ddb6aeb3775a7fde1dd321adf194545cfe32ca8e
+   merkle root: 9316da726143db812f9d4dbe1ca8ef5d78f20e61600591c5e709912a72bfc0d9
+   time: [1388792190] Fri Jan 03 23:36:30 UTC 2014
+   difficulty target (nBits): 419628831
+   nonce: 639044046
+
+4459 [PeerGroup STARTING] INFO  com.google.bitcoin.core.PeerGroup - Peer discovery took 354msec
+4536 [PeerGroup STARTING] INFO  com.google.bitcoin.core.Peer - [2001:8d8:840:500:0:0:39:1ae]:8333 - No route to host
+4537 [New I/O worker #2] INFO  com.google.bitcoin.core.PeerGroup - [2001:8d8:840:500:0:0:39:1ae]:8333: Peer died
+4537 [PeerGroup STARTING] INFO  com.google.bitcoin.core.Peer - [2001:788:2:117:0:0:0:204]:8333 - No route to host
+4538 [New I/O worker #3] INFO  com.google.bitcoin.core.PeerGroup - [2001:788:2:117:0:0:0:204]:8333: Peer died
+4538 [New I/O worker #2] INFO  com.google.bitcoin.core.Peer - [2001:470:c1f2:3:0:0:0:201]:8333 - No route to host
+4538 [New I/O worker #4] INFO  com.google.bitcoin.core.PeerGroup - [2001:470:c1f2:3:0:0:0:201]:8333: Peer died
+4628 [New I/O worker #6] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bitcoin.dashjr.org/68.229.166.59:8333 as: /BitCoinJ:0.10.3/
+4731 [New I/O worker #7] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bluematt.me/130.180.122.103:8333 as: /BitCoinJ:0.10.3/
+4751 [New I/O worker #6] INFO  c.g.b.core.TCPNetworkConnection - Connected to 68.229.166.59: version=70001, subVer='/Satoshi:0.8.6/', services=0x1, time=Tue Jan 07 00:50:18 UTC 2014, blocks=279024
+4765 [New I/O worker #5] INFO  c.g.b.core.TCPNetworkConnection - Announcing to seed.bitcoin.sipa.be/109.235.49.27:8333 as: /BitCoinJ:0.10.3/
+4830 [New I/O worker #6] INFO  com.google.bitcoin.core.PeerGroup - [68.229.166.59]:8333: New peer
+4831 [New I/O worker #6] INFO  com.google.bitcoin.core.PeerGroup - Setting download peer: [68.229.166.59]:8333
+4832 [New I/O worker #6] INFO  c.g.bitcoin.core.DownloadListener - Downloading block chain of size 531. 
+4921 [New I/O worker #7] INFO  com.google.bitcoin.core.PeerGroup - [130.180.122.103]:8333: Peer died
+5034 [New I/O worker #5] INFO  c.g.b.core.TCPNetworkConnection - Connected to 109.235.49.27: version=70001, subVer='/Satoshi:0.8.5/', services=0x1, time=Tue Jan 07 00:50:20 UTC 2014, blocks=279024
+5260 [New I/O worker #5] INFO  com.google.bitcoin.core.PeerGroup - [109.235.49.27]:8333: New peer
+7019 [New I/O boss #17] INFO  com.google.bitcoin.core.Peer - [101.28.51.40]:8333 - connection timed out
+7019 [New I/O worker #1] INFO  com.google.bitcoin.core.PeerGroup - [101.28.51.40]:8333: Peer died
+7020 [New I/O boss #17] INFO  com.google.bitcoin.core.Peer - [66.56.41.123]:8333 - connection timed out
+7020 [New I/O worker #8] INFO  com.google.bitcoin.core.PeerGroup - [66.56.41.123]:8333: Peer died
+7236 [New I/O worker #9] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bitcoin.dashjr.org/180.154.69.185:8333 as: /BitCoinJ:0.10.3/
+7280 [New I/O worker #10] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bluematt.me/88.192.246.174:8333 as: /BitCoinJ:0.10.3/
+7490 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278496/0000000000000002dde3b297f44eddaf45b7f69cdfb420d46cef0e8e521c5638
+7512 [New I/O worker #9] INFO  c.g.b.core.TCPNetworkConnection - Connected to 180.154.69.185: version=70001, subVer='/Satoshi:0.8.5/', services=0x1, time=Tue Jan 07 00:50:17 UTC 2014, blocks=279024
+7516 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 26msec
+7600 [New I/O worker #10] INFO  c.g.b.core.TCPNetworkConnection - Connected to 88.192.246.174: version=70001, subVer='/Satoshi:0.8.6/', services=0x1, time=Tue Jan 07 00:50:23 UTC 2014, blocks=279024
+7625 [New I/O worker #6] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+7746 [New I/O worker #9] INFO  com.google.bitcoin.core.PeerGroup - [180.154.69.185]:8333: New peer
+7746 [New I/O worker #9] INFO  com.google.bitcoin.core.PeerGroup - Unsetting download peer: [68.229.166.59]:8333
+7746 [New I/O worker #9] INFO  com.google.bitcoin.core.PeerGroup - Setting download peer: [109.235.49.27]:8333
+7746 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Downloading block chain of size 527. 
+7882 [New I/O worker #10] INFO  com.google.bitcoin.core.PeerGroup - [88.192.246.174]:8333: New peer
+8646 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278497/000000000000000181fd47a47727a6cce1ade92a77cc6a8adcb5deee15a8643e
+8648 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+14163 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278498/0000000000000002106d63408afe2d40dd8cbde271b85ce7bd8ae4760afe864b
+14164 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+15682 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278500/000000000000000142468ef10c92c7566a2f398f11b11e340d15c6aef19e1f63
+15684 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+16477 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+17480 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278502/00000000000000004865fb35fb7e7d5ce43a6feb50aa7df82a86619a5e096df5
+17482 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+18459 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+18468 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 1% done with 521 blocks to go, block date Jan 4, 2014 1:16:32 AM
+19468 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278503/00000000000000005a966a8fb6598edf89add7fc8ae6cba2933618fca5a3d53b
+19470 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+21109 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278504/000000000000000190fc419aaa15de2a41d247de433557c6f1ee7418b8433522
+21110 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+23421 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278505/00000000000000008564425aecc160fdcc168cf7aec24cfa9f8be2894aaa9507
+23422 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+25224 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278507/0000000000000001448d408f38fc39dbede11b35ef0dc4740f4864d1c2cfb5ad
+25226 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+25697 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+25698 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 2% done with 516 blocks to go, block date Jan 4, 2014 1:55:39 AM
+26699 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278510/000000000000000042936c5bf089c000484390b08812d7cec07a53b0162addca
+26700 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+27503 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+28506 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278511/00000000000000011432564b8186eebdfd04235cccf5a56574f1880108efb993
+28507 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+29048 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 3% done with 511 blocks to go, block date Jan 4, 2014 2:23:23 AM
+30047 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278514/0000000000000001edaa191557665aeecf43da67243090806c78b6a2ef15e9bb
+30048 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+32227 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+33231 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278516/00000000000000019e1c99964ef0b1a38b0040ad843214c12a58f3b7c7587fb8
+33232 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+33831 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+34835 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278518/00000000000000026dafdaa584610c842d6891fcacfc89677e447f19b49fc1a1
+34836 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+37112 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+37114 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 4% done with 505 blocks to go, block date Jan 4, 2014 3:29:09 AM
+38115 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278521/00000000000000013122305a6ab771b90f3badb2b8ccf39b9669395930acc2a6
+38116 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+38544 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+39411 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 5% done with 500 blocks to go, block date Jan 4, 2014 3:40:51 AM
+39547 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278524/00000000000000000c847412b6990c7fc61d7bea93a696988ab13b52d981cea2
+39548 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+40385 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+41388 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278525/0000000000000002a4186c5c6e983b8c9f949e5a1b09d2dacdfc3ae8b085c5e2
+41389 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+43588 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278527/000000000000000131fd056ce28cdb66ae9a2cc04b834063b26052360483e396
+43590 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+45141 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+46144 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278528/00000000000000026b449d32fa0d6ff24a91ec05ace9d3f8bf0d4212d12730bc
+46145 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+46333 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 6% done with 495 blocks to go, block date Jan 4, 2014 4:45:16 AM
+47333 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278529/000000000000000209b46f982784ef7f48635066e7a706ca2b28c4b1f5ea66c0
+47335 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+51143 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278530/0000000000000002ec9bfcf28f6ca5cedf52728fa7022d53066f36a7bf173608
+51145 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+55110 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278531/0000000000000001f26681727e510ea2d8367f22e210451694acd84280783f65
+55112 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+58509 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278533/0000000000000001033724b06ca90cd4a036632766217c39d448c477c91ded78
+58510 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+58802 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+58803 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 7% done with 490 blocks to go, block date Jan 4, 2014 6:19:38 AM
+59803 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278534/000000000000000058d5ade07621bc1c09bb0fe01ba04844a3c403a0593a98d3
+59804 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+61257 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278536/0000000000000000c7d117a7ae597543f211bc72defb038a6542ee0c58f77db2
+61259 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+66065 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+67070 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278538/00000000000000012118d6895ff0a29a74a4f68c6d236ea522df42e720a29abc
+67071 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+68676 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+69678 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278539/00000000000000003143fcb75cb9a018165a1959dfaa4c7a6089014d568da51f
+69679 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+71052 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 8% done with 484 blocks to go, block date Jan 4, 2014 8:34:32 AM
+72053 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278540/000000000000000293dce4ead626cf5eec3fa5cb92bd6a3faf213436f43a4158
+72055 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+73074 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278544/0000000000000001efbcf4665977f73042dd5c12f6b3f793d7b0ceff4580b9cf
+73076 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+73109 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+73110 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 9% done with 479 blocks to go, block date Jan 4, 2014 8:50:45 AM
+74111 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278546/0000000000000000871d169cb93e74355610f10993662fa597173cc16cb9f38a
+74112 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+75433 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+76435 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278547/0000000000000001cb50359a6a761555a4a9b9ba4dfc193b9ea7caaa0bcc2f88
+76436 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+79867 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278548/00000000000000012ed359b30d0728142cd2cb3e071e4c1fc9ad7445852ab474
+79869 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+83636 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278549/000000000000000088cebcfa2e6653b0a9eda432ae1fb9711c36cb1375f9059e
+83637 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+84005 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 10% done with 474 blocks to go, block date Jan 4, 2014 10:37:38 AM
+85006 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278551/0000000000000000627a786abe0832726cdc661e1ed31a298f6d8d7c6c609fe8
+85008 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+85035 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+85719 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 11% done with 469 blocks to go, block date Jan 4, 2014 11:03:25 AM
+86036 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278556/0000000000000001d95e1d4170f431e0295a24cea0259ebc05d98993d8a6a8c9
+86037 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+88232 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+89234 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278557/0000000000000000be4921fab20219b06639314cba2483463ef6ff87c7b8529c
+89235 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+90295 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278560/0000000000000001916faa85bc307ca096504f977a49ec4854e5cac78db89c90
+90296 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+90703 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+90704 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 12% done with 463 blocks to go, block date Jan 4, 2014 11:37:56 AM
+91704 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278564/00000000000000009df9e05cfb4b93e1e4e95f5af3cde6cb9f9e54d0f9d8a917
+91706 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+91942 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+91956 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 13% done with 458 blocks to go, block date Jan 4, 2014 11:56:13 AM
+92944 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278568/00000000000000010f506a248cb023addb43b06874f77e0e5fd78036af0ea1e5
+92945 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+93038 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+93933 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 14% done with 453 blocks to go, block date Jan 4, 2014 12:24:46 PM
+94041 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278571/0000000000000000a981eecb9a433719c6a43ee72eb10e2d9143cb75e941efec
+94043 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+94058 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+95059 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278576/00000000000000028e8c0b726ce5c7e9370fbdbd34d22e73fe173b636873f5ca
+95060 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+96517 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+96518 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 15% done with 447 blocks to go, block date Jan 4, 2014 12:55:31 PM
+97519 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278579/0000000000000002c39605667ef793ced8bc34fd184814aa50b820e6057add3b
+97520 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+99276 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+100084 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 16% done with 442 blocks to go, block date Jan 4, 2014 1:34:52 PM
+100278 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278582/0000000000000002188fae55e9f1817eadab098875573a23478f637ee88a1ed8
+100279 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+101375 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+102379 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278585/00000000000000012f0e01b271171998183f955548bf6ba7fad99ca341ccfeea
+102380 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+103383 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+103389 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 17% done with 437 blocks to go, block date Jan 4, 2014 2:20:55 PM
+104385 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278587/00000000000000021305ca3a5504fc96660f08ac4f23f56cb099c07dee099d7e
+104386 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+104992 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+105994 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278588/000000000000000259a8cc917d0a753dc6c91a4e397d629ce00b930e518fa433
+105996 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+107187 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278591/0000000000000003018b9f5ae51d411f70af6df9ac6156d023e256f775b0b697
+107188 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+109926 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+109927 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 18% done with 432 blocks to go, block date Jan 4, 2014 2:56:06 PM
+110927 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278593/0000000000000000253f582a191e88a17f642ab5fa3b4551afcb9f2e6632e8c5
+110929 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+112753 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+113755 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278594/00000000000000018d55d28d6da23f334f2f44f2a43fa58fa6eedddad816901a
+113756 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+115229 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278595/0000000000000002175c4a45b0c9d69f7c05e0c67a729b54a06e9e14bdf53b3f
+115231 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+116305 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278596/00000000000000007e1766103e4d49cc06dfac42b8e0cee5c0c435544ce8826d
+116306 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+118758 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278597/000000000000000117a974f0b875a343977fa2a72fe56eed1d30631c87ccfb28
+118759 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+119779 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 19% done with 426 blocks to go, block date Jan 4, 2014 4:02:39 PM
+120779 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278598/00000000000000000b5d9f1b8e7304088b8e7ddb4bd243479ef101b03a080b1a
+120780 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+122184 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278599/00000000000000020e1ce04f83186757239464ef3d71d5251460f949a3fe7d11
+122185 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+123226 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278601/0000000000000001fc89a18ce3e3ee36b0630f93b7685533f6a657843a7d38ad
+123227 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+125642 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+126644 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278602/00000000000000003cb73777fb51126e7e671422a683ead56a2ed4b75b50abb2
+126646 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+126993 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 20% done with 421 blocks to go, block date Jan 4, 2014 4:57:44 PM
+127994 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278603/00000000000000027de4d31a376bd71bc4f31ac5f4b9a7434e3ffc1ecf48d1e1
+127995 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+129209 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278604/000000000000000188dcd90c7a1702b679e7378ac0e3fca1c1b7f39beda38819
+129210 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+130547 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278606/0000000000000000bccd8de6ac87df88010e356075ea98515a2369566a89b47c
+130549 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+131929 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+132932 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278607/00000000000000012c6fd6321531cacfc9b663647df45e3f96f3416700693cc0
+132934 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+132951 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 21% done with 416 blocks to go, block date Jan 4, 2014 6:11:21 PM
+133952 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278608/000000000000000192c5f077e57987841140b01d0758fb5f065731d7e036efcf
+133953 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+135673 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278610/000000000000000108a7ed3268f150e73e25de4fd541bfbda6ffc59aac8d7856
+135674 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+139844 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+140848 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278611/000000000000000108ba0a5aa2b384e218c19e63fcb4f26d8092f312eeaabd03
+140850 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+141951 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278612/0000000000000000046eee0c96d835a6a275ba3c8c2607b91a9f71a04278a490
+141952 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+143940 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 22% done with 411 blocks to go, block date Jan 4, 2014 7:03:11 PM
+144941 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278613/0000000000000000c132000e2da47e369c5f6fa17d6cc626a678268af4106c42
+144943 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+146469 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278614/00000000000000003fce752ccafde7d45c25e741bd0ded09787d8a84756e3739
+146471 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+148020 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278615/00000000000000007e3af7f935131d925eea58659e6171304a4aa53d8c84d998
+148022 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+152076 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278617/000000000000000115075d7a69c34aeff118fe4e29bed0e452d2f9fdeab27a30
+152078 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+153700 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+154702 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278618/00000000000000019095e5e401738722cb34cf704658e8c5f23f0d4716a98476
+154703 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+157459 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 23% done with 405 blocks to go, block date Jan 4, 2014 9:03:04 PM
+158459 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278619/000000000000000091817642d3a3e628bf5afd198f057b17f5796239b9cd709c
+158461 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+162359 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278621/0000000000000000cfa133ff79e2bc9a7ed8eda6d21c7992e296cf5fed54551c
+162361 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+162792 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+163794 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278622/0000000000000001fe63171693741e04749e0d14a039ad93c7779cbd940ca63b
+163796 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+166238 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 24% done with 400 blocks to go, block date Jan 4, 2014 10:01:19 PM
+166250 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278624/000000000000000299abcb880bda1650d133adc0390c53aec1810daade4e02f6
+166251 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+168502 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+169505 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278625/0000000000000002cebeb9e960d4d4c13d14518a27986704aa9dd960392a3e45
+169507 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+170578 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278627/0000000000000002af233a45ebd6924c08eb759ceaa91e198dda0956a120c248
+170579 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+170685 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+171040 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 25% done with 395 blocks to go, block date Jan 4, 2014 10:46:03 PM
+171687 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278630/0000000000000001fcb9aca54fc9909326abe591692492290038fe315c0e0fcf
+171688 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+171831 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+172832 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278631/0000000000000001c471a15eeb79b938a6686c31b42095ca81ca68a9a3ee938a
+172834 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+174319 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278632/00000000000000012d165270071b7bd6735d0da74a2e8c7b2eca8f8d6bbe1560
+174320 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+176124 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278633/00000000000000001148337a157b408ac4257f19bea104a68b3f933d8a10f010
+176126 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+176644 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 26% done with 389 blocks to go, block date Jan 4, 2014 11:43:30 PM
+177634 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278636/00000000000000021c63aeec39e6fc1e15bb264b885ba0fef6fdd8b980a07fa2
+177635 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+178028 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+179030 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278638/000000000000000114834f7deb45e88f998c920fff7099c8e4d5b1560347ae6e
+179031 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+180617 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+181089 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 27% done with 384 blocks to go, block date Jan 5, 2014 12:47:08 AM
+181619 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278640/000000000000000081d57600096dadc3e2f3a8bed64d864346c12d53427e698d
+181620 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+183103 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+184104 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278641/0000000000000001477ab0d421fb3aa477f2fcde0b6e8a7ff181510378cbcff1
+184106 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+186214 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278643/000000000000000193da3d39a8fa77a68d379a5254fa0f0dc43d662f8643cbb7
+186216 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+186831 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+187833 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278644/0000000000000000b4b72fdf6edd51894d0eb11ff091e117037f217b68c9729c
+187834 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+188439 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 28% done with 379 blocks to go, block date Jan 5, 2014 1:09:04 AM
+189440 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278648/0000000000000001ff704c7957b8f5cb9b12e63f779ae04b57cd402305decedb
+189441 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+190361 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+191070 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 29% done with 374 blocks to go, block date Jan 5, 2014 1:30:35 AM
+191362 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278651/000000000000000048fd23d666b1553551b2bcaed9c2b53cc61b8d1f373cf987
+191364 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+192219 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+193222 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278653/0000000000000002e450033c60530ffe207af2b0901c38a288224371ab041d79
+193223 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+193599 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+194601 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278655/000000000000000035a066db0a1cce1d276d8e4a70fe21b29440b161214cb01f
+194602 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+194604 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+194605 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 30% done with 368 blocks to go, block date Jan 5, 2014 2:16:07 AM
+195606 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278658/0000000000000002ffad802130f0099f2671848e811d5ee9df61f04c2b08405b
+195608 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+196544 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+197274 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 31% done with 363 blocks to go, block date Jan 5, 2014 2:51:09 AM
+197545 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278661/0000000000000000c5c9e1e886d6a1fa3a63c3b0218314e9c2d9f26ae1c18ba7
+197547 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+199927 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+200930 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278664/0000000000000000c08036d972e03d65f9070d5675e14edd6fb77e81947e0c34
+200931 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+202852 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+203400 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 32% done with 358 blocks to go, block date Jan 5, 2014 3:47:42 AM
+203854 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278667/0000000000000001da385660f04fd25a780f99ac4f4607b3551945ef12d979b3
+203855 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+203923 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+204924 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278669/0000000000000002449d280104ec9d525ccf2cf99604e1c055d93c9e9bb786b4
+204926 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+205701 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+206704 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278670/0000000000000001aeafc81608aff858626f09c4a01ac163ead4bea0f5449b10
+206706 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+206796 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 33% done with 353 blocks to go, block date Jan 5, 2014 4:13:17 AM
+207797 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278672/00000000000000002ce1b437663f90b836c8e46a223ff29aed54818120cf848a
+207798 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+209569 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+210571 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278673/0000000000000000f22c5d5dce4e3775414f05974902f763242cafe9bb8c17e4
+210572 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+212163 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278674/000000000000000099254d63d4c993c5204eb048e5e0e14a52b976bd88ae56ab
+212164 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+213494 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278676/0000000000000001d1a271a490916308c772fd4a115e5cf5a27e5c336835ffba
+213495 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+215425 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+215425 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 34% done with 347 blocks to go, block date Jan 5, 2014 5:15:06 AM
+216426 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278679/00000000000000015bedaa39f0c8974b781e6f8bbd7a38f577129499ee8146ca
+216428 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+217415 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+218418 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278680/0000000000000001f41111e9185ca4b4da33286bd6aa11de6a78ce7d4df7ef75
+218419 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+219924 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 35% done with 342 blocks to go, block date Jan 5, 2014 5:37:01 AM
+220698 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278684/0000000000000000eb66b7a1259a08dfdbf94b99f6ceb2b630df2d4f536cbfe6
+220700 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+221103 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+222105 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278686/00000000000000023f333e897d2eb57e8aed8e2e9095c0e4b2720d86492fe9f7
+222106 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+222760 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+222761 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 36% done with 337 blocks to go, block date Jan 5, 2014 5:59:11 AM
+223762 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278688/0000000000000000c9fbd7e87b3228b7f08dfacb4995bb82efd86e6b6d0d80f4
+223763 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+225960 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+226963 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278690/0000000000000001657a7866be99cc8bb6d6160f07d0a3bdea4ac7dad40d1f44
+226964 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+227214 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+227661 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 37% done with 332 blocks to go, block date Jan 5, 2014 6:39:25 AM
+228216 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278693/0000000000000002861ee0919fc86990573ac360820766dc1b9ba580e5ccf7b6
+228218 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+228456 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+229458 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278695/0000000000000001a9b1548aaf26419c4fc4290d191052dc7927e01b9937401e
+229460 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+230138 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+231140 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278696/00000000000000006424a4e0bc19626c555a9a46b6456d68e3204c5de7cb40f7
+231141 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+232561 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 38% done with 326 blocks to go, block date Jan 5, 2014 7:30:37 AM
+232692 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278698/00000000000000027e9f38b17b551757ad44ab773f5e347739922fac4434e3b2
+232693 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+232876 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+233877 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278701/0000000000000001c11c498a1836dbc759fb0ade9fc0a2ff801ebf7a9791f87c
+233878 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+234143 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+234144 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 39% done with 321 blocks to go, block date Jan 5, 2014 8:14:14 AM
+234991 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 40% done with 316 blocks to go, block date Jan 5, 2014 8:38:52 AM
+235145 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278708/0000000000000000a7a14e2f813217e95a1007ff3a83c5ca2185d73b4c660272
+235147 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+235209 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 7 blocks per second
+235767 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 41% done with 310 blocks to go, block date Jan 5, 2014 9:07:42 AM
+236211 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278716/000000000000000086cb05d2523c0bc8aad04f017644ef92483ecc5da278e00a
+236212 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+237712 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 8 blocks per second
+238713 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278718/000000000000000018776b3b7618fc9e8877e4844565f5a366a7b0cc3c892df2
+238715 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+238868 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+238869 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 42% done with 305 blocks to go, block date Jan 5, 2014 9:48:20 AM
+239870 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278721/0000000000000000a812bc963db69d83384241e2fc85b7b9ab9c4c868997109a
+239871 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+240975 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+241464 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 43% done with 300 blocks to go, block date Jan 5, 2014 10:26:34 AM
+241978 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278727/00000000000000003a329fe533b4bfe9558d15df710a4e4b70af3c5feecf2d34
+241979 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+242013 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 6 blocks per second
+242233 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 44% done with 295 blocks to go, block date Jan 5, 2014 10:59:13 AM
+243015 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278732/000000000000000224ed9a8610d8e30272ca6861cc47695ce859d63ec9f8e9f7
+243017 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+243168 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+243361 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 45% done with 289 blocks to go, block date Jan 5, 2014 11:32:53 AM
+244170 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278738/00000000000000019d71cf51166ef80efdaa718c73b3b440370d4adfeaf26fef
+244172 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+244303 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 6 blocks per second
+244537 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 46% done with 284 blocks to go, block date Jan 5, 2014 12:16:39 PM
+245158 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 47% done with 279 blocks to go, block date Jan 5, 2014 12:36:07 PM
+245305 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278745/0000000000000000d5147dc64157d6c92f6de6ccb34c894011dc0aa2a42510d5
+245306 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+245554 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 7 blocks per second
+246555 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278747/0000000000000002c6437a58f38c313ce55db3d36b342b235f25a58b5fa2667e
+246557 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+247307 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+248309 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278748/00000000000000024fc17995596fccb9613c3af6ebf0f63cc01937c06b85ae7f
+248311 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+250352 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 48% done with 274 blocks to go, block date Jan 5, 2014 1:53:19 PM
+250645 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278751/00000000000000019b727f927167bd3a5f55237a17f4c02b5326b5e1fdf8d5da
+250647 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+250737 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+251739 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278755/00000000000000004950396a8d217e6be722ee8e94b36c960ed4caa33793b6f5
+251740 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+252667 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+252669 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 49% done with 268 blocks to go, block date Jan 5, 2014 2:34:08 PM
+253669 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278760/0000000000000000bd07ef04578dc4673c822bdd4170f58a486f00798d6ddb69
+253671 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+254015 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+254016 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 50% done with 263 blocks to go, block date Jan 5, 2014 2:57:57 PM
+255017 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278765/000000000000000303857f84fdb649dff375c83516aedd4e3111b0b684056935
+255018 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+255504 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+255506 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 51% done with 258 blocks to go, block date Jan 5, 2014 3:38:08 PM
+256506 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278767/00000000000000012f21305d7cb927301243a9ae2d921fe4d4155ea59e8e2ce5
+256507 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+256744 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+257747 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278770/000000000000000168256fe207b62c8d14bb31f98327c35bd8f19236f5efdc93
+257748 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+258110 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+259009 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 52% done with 252 blocks to go, block date Jan 5, 2014 4:32:01 PM
+259113 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278773/00000000000000028470e1f73211cbcbc0b7a00e35989f7f3e1504483ca3a2a7
+259114 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+259226 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+260228 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278776/000000000000000264dfb00229cb6c2d5e1b2ae59059a2c51a6c8cf9dcf2aa5d
+260229 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+260524 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+260526 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 53% done with 247 blocks to go, block date Jan 5, 2014 5:02:44 PM
+261526 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278781/0000000000000001fc1681e84a7161e86f15c357076278e0d613ec150dc2f29d
+261527 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+261608 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+261609 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 54% done with 242 blocks to go, block date Jan 5, 2014 5:23:18 PM
+262610 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278783/0000000000000002b412ccf96225b5da1eb8fd124e896fe1a5cdbed19d351fd6
+262611 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+262690 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+263691 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278786/00000000000000002a5f00fca1a57753fdd4f1edc9472e2397c8f0c24a3de6b7
+263693 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+264792 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+264793 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 55% done with 237 blocks to go, block date Jan 5, 2014 5:54:01 PM
+265794 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278788/0000000000000000794d06f7ac135e2c4a538aae22e8313435ae9fd30a4e6c63
+265796 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+266842 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+267845 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278789/00000000000000020ad14ddbbe1eb61f02d994a50d735bd4b9ea975779025cf3
+267846 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+268753 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 56% done with 231 blocks to go, block date Jan 5, 2014 6:32:23 PM
+268962 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278794/000000000000000058be94b2b17fca1888fee4192e8b7f7ebce68a38d0845d7d
+268964 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+269183 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+270185 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278797/0000000000000001faa375191f6acc9a5f08798f55a5f0567539409955bc98d3
+270186 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+270502 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+270503 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 57% done with 226 blocks to go, block date Jan 5, 2014 7:06:55 PM
+271504 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278800/0000000000000002f3685ae01c53c0dee722e411fc97343d99d3dd3569b95516
+271505 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+271818 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+272821 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278801/0000000000000000ae2073d9f5379922f2fa6f6930ac242002f19b083abaa7f3
+272822 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+275996 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278802/00000000000000021eabb73332af8e75fa83e330de5a673e0e75655beae9e591
+275997 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+276533 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 58% done with 221 blocks to go, block date Jan 5, 2014 8:14:55 PM
+277534 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278804/00000000000000008090abc1c03f9611ad26bf24fbe7410224b3bb5c1bf82bc4
+277535 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+277715 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+278554 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 59% done with 216 blocks to go, block date Jan 5, 2014 9:02:55 PM
+278718 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278808/0000000000000002efa0bb8e827dd32147f5ce5256d17296387c445be469e219
+278719 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+279057 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+280060 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278810/000000000000000247f8cf2392f15fdb98f1b6658b794d77d9afdc0a01b5fca7
+280061 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+280122 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+281125 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278812/0000000000000002ae40257d0d7975cf0e49743dfefdf74d8ba6593066837f1a
+281126 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+281495 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+281547 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 60% done with 210 blocks to go, block date Jan 5, 2014 10:10:07 PM
+282497 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278815/00000000000000022b2727d80864cc4aa0b0cacdc85cf709f0df862c7373fecc
+282498 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+282712 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+283714 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278817/000000000000000162f3fe085f2ab53cbbd6770b2bea7a55265d199a23276490
+283716 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+285147 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+286149 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278818/0000000000000002d2fabecd507916a97a7fb46c7ceab970e423f2a5e7acc502
+286151 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+286869 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 61% done with 205 blocks to go, block date Jan 5, 2014 10:53:13 PM
+287869 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278821/0000000000000002126f30bdab0ec3a3c8b23bf555acb22ccb32a912fb5fe66b
+287871 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+287927 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+288547 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 62% done with 200 blocks to go, block date Jan 5, 2014 11:10:37 PM
+288929 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278824/0000000000000000eaa79ae869861a6ee453b3bd041ccd686782deb7db87eb62
+288930 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+289114 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+290116 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278827/0000000000000002fa2c43772f34ab3284803255fef5354755fa1568d66e4996
+290118 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+290483 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+291023 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 63% done with 194 blocks to go, block date Jan 6, 2014 12:09:40 AM
+291486 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278832/0000000000000002343f7194619ad28b65073d658b22d3a39a3a725886931b03
+291487 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+291684 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+292686 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278834/00000000000000002f1003d49eab457bf34f984880d59cde4c7bc6bc284c2df2
+292687 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+293499 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+293500 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 64% done with 189 blocks to go, block date Jan 6, 2014 12:22:46 AM
+294501 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278837/00000000000000016f569b32d29a04933f8830b2110e5d4c64e32903a34db169
+294502 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+294901 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+295902 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278839/0000000000000001c221c3bae7f8784892a2115c33f5a1ff1991c8bf4c43e93f
+295904 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+296478 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+296479 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 65% done with 184 blocks to go, block date Jan 6, 2014 12:45:01 AM
+297480 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278842/00000000000000027c1dbeaf61720af4b9d0aa48e14653812e9eb6d0a7289ae4
+297481 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+297602 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+298535 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 66% done with 179 blocks to go, block date Jan 6, 2014 1:17:37 AM
+298604 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278845/0000000000000000bd83869823ce3d491b35fa374576d7e45be3e22e2990c045
+298605 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+298696 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+299697 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278850/0000000000000001d2e5f5ccfb0b59c1b1efc1146f27202fc0865ae2caa12b0b
+299698 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+299982 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+299983 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 67% done with 173 blocks to go, block date Jan 6, 2014 1:45:02 AM
+300983 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278852/000000000000000251064b46952ef2f341712c26f8e9369235ce6b4add149ea3
+300985 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+302452 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+302457 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 68% done with 168 blocks to go, block date Jan 6, 2014 2:39:48 AM
+303453 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278856/0000000000000002580118f6d6872bf25643fba8431e49f0c203d7a9b107d124
+303455 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+304488 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+305490 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278857/0000000000000001512191e8dec7c873430301cddd9899781dbcfbd7398d866e
+305491 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+306625 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278860/000000000000000027ee13e8ff31f4f4fdd3edc71c58a2e3bfa76478f9efeeb4
+306627 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+306649 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+306650 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 69% done with 163 blocks to go, block date Jan 6, 2014 2:52:35 AM
+307650 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278864/0000000000000001cfaa5555ab19a4ec2d4fb03ad0e8b08b52b87a567464d4b8
+307651 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+307870 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+308292 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 70% done with 158 blocks to go, block date Jan 6, 2014 3:37:07 AM
+308871 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278867/00000000000000025dd61d9aba1de3d45f0fb3745c628f3db8bb54144b50505b
+308873 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+309562 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+310565 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278869/0000000000000000e5afc93631c47fdcaf5849810d2da1e03026efba09ce90d6
+310566 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+311680 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+312687 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278870/000000000000000176de225544cc6c575becd7ddcf8199473db7440df1b44d2c
+312688 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 0msec
+314976 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 71% done with 152 blocks to go, block date Jan 6, 2014 5:08:15 AM
+315243 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278872/0000000000000001190bee8a28992bd9363b647035bc34524125295aa782149a
+315244 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+315457 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+316459 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278876/00000000000000009ee09e5fe8847229caf898cae2663472662c067b244e264d
+316460 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+316539 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+316539 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 72% done with 147 blocks to go, block date Jan 6, 2014 5:14:26 AM
+317540 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278881/0000000000000000020d6cfaf63d3e86d5da310ceaed01b544c427b4ca7c1ce0
+317542 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+317610 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+317611 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 73% done with 142 blocks to go, block date Jan 6, 2014 5:37:30 AM
+318611 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278884/00000000000000027ed893f65febf49db049e17946c62e54403610cab7b5f014
+318613 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+318738 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+319503 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 74% done with 137 blocks to go, block date Jan 6, 2014 6:33:27 AM
+319740 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278887/000000000000000103996844aeea6f397022d9d8b63ac9d7ec8d8e1a9e0096e1
+319741 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+319892 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+320895 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278888/0000000000000001e2752327c5b420632b9584066f1b659fd98eb0cae77cb4d4
+320896 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+322742 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278889/00000000000000020e984cc10105a378b5f840b65d45d7c340cb037b1ecc28db
+322743 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+325144 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 75% done with 131 blocks to go, block date Jan 6, 2014 7:41:27 AM
+325290 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278893/0000000000000002d0f571327e21f9097787e883c10b0097c1e6f207d69f6d48
+325292 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+325323 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+326325 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278896/00000000000000022165767bc3e9d0dc77f9e68b8e82d7bcbfc0dc5b1d8d7ebc
+326327 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+328404 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+328872 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 76% done with 126 blocks to go, block date Jan 6, 2014 8:46:17 AM
+329407 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278898/0000000000000000f75b46c09be6727b0ed2ab874d8af9486b016b1dbbcdde6e
+329409 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+330355 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+331357 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278900/0000000000000002e38233adbd81ab5bfc7561c769dc4aa1ac054df9090f6506
+331359 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+332702 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+333705 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278902/000000000000000226e7fe565a4d03b21900f25d6aa92360bb1980c1bf7a47d4
+333707 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+333838 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+333839 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 77% done with 121 blocks to go, block date Jan 6, 2014 9:46:27 AM
+334840 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278906/000000000000000262f2493c74260706f31dd7c9a3d062288cb4fe052b862ea7
+334841 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+335353 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+335897 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 78% done with 115 blocks to go, block date Jan 6, 2014 10:20:12 AM
+336356 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278910/00000000000000005eaa689396f916c42f884a8c73e2c67e49fae5932cc9826f
+336358 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+336565 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+337568 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278911/00000000000000030200c36802955af26ce5560ff57ed40c50cbb90b493a8977
+337569 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+341214 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 79% done with 110 blocks to go, block date Jan 6, 2014 11:00:28 AM
+341810 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278914/0000000000000000ef9ccffa44ac5075d404464bd3e985cb7878e3c693f4e842
+341811 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+341811 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+342812 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278916/0000000000000001627c58c65ad9fc3a443e3380e033167c695e6d3f926de776
+342814 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+342980 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+343851 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 80% done with 105 blocks to go, block date Jan 6, 2014 11:45:26 AM
+343983 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278919/000000000000000289cf2cc408f17a4dc82331d3e53503d81cbe3dd56a82e00f
+343985 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+344208 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+345211 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278922/00000000000000029927f22c21fd0f5537fda216034c732e9c7255f4a9d0486a
+345212 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+345403 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+346039 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 81% done with 100 blocks to go, block date Jan 6, 2014 12:34:25 PM
+346405 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278924/000000000000000015d16e0f4e3e19e346aca576f2dabbb15d07253279276ade
+346406 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+346431 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+347433 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278925/000000000000000237685aa4f4e8b5f8d4c4e760d93208b2be621479e9013230
+347435 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+349407 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278927/00000000000000005a3ce0a5277b28a40ca22f5ad63a4936e93885aaa84dc313
+349409 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+350707 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+351710 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278929/0000000000000000831bfd3c356edea1263e1bf6aaa4e363a83df74c8b23dc0d
+351712 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+351728 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+351730 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 82% done with 94 blocks to go, block date Jan 6, 2014 1:27:02 PM
+352730 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278932/0000000000000002e96846802c5b35b031f38589e23493270edcf8aa4a8e09ff
+352731 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+352903 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+353182 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 83% done with 89 blocks to go, block date Jan 6, 2014 1:42:59 PM
+353906 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278937/0000000000000001bb52bff955fb5ce3d20e047dbe3884b94a7420a0c8b5462f
+353907 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+353967 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 5 blocks per second
+354401 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 84% done with 84 blocks to go, block date Jan 6, 2014 2:07:43 PM
+354968 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278941/000000000000000088ceb1558cbc516a91e2a25d4672b2daa809bc14c3b58fd1
+354970 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+355205 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 4 blocks per second
+356207 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278943/000000000000000109e09cb569d9b41b88840bbda485228eaa1cc14e8ef99323
+356209 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+356341 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+356487 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 85% done with 79 blocks to go, block date Jan 6, 2014 3:05:27 PM
+357343 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278945/0000000000000001c5ba407f9e16f877abdc39e428d461e668077956f8c89db4
+357344 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+359073 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+360077 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278946/00000000000000002f7f54dd569df69c6acf1a10690d9b93b291bbbabfe69212
+360078 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+361483 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278949/00000000000000028abf2fc8644191196bfffe789f5c9854ffdc87d4f731c1a1
+361484 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+361711 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+362441 [New I/O worker #6] INFO  com.google.bitcoin.core.Peer - [68.229.166.59]:8333 - Operation timed out
+362459 [New I/O worker #6] INFO  com.google.bitcoin.core.Peer - [68.229.166.59]:8333 - Socket is disconnected
+362460 [New I/O worker #6] INFO  com.google.bitcoin.core.PeerGroup - [68.229.166.59]:8333: Peer died
+362589 [New I/O worker #5] INFO  c.g.bitcoin.core.DownloadListener - Chain download 86% done with 73 blocks to go, block date Jan 6, 2014 3:55:00 PM
+362633 [New I/O worker #11] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bitcoin.dashjr.org/192.0.143.26:8333 as: /BitCoinJ:0.10.3/
+362713 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278951/0000000000000002a4f7b442e7464baefde66b1c2adf22670c5530f001c4039d
+362714 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+362838 [New I/O worker #5] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+363605 [New I/O worker #11] INFO  c.g.b.core.TCPNetworkConnection - Connected to 192.0.143.26: version=70001, subVer='/Satoshi:0.8.3/', services=0x1, time=Tue Jan 07 00:55:33 UTC 2014, blocks=279025
+363746 [New I/O worker #11] INFO  com.google.bitcoin.core.PeerGroup - [192.0.143.26]:8333: New peer
+363747 [New I/O worker #11] INFO  com.google.bitcoin.core.PeerGroup - Unsetting download peer: [109.235.49.27]:8333
+363747 [New I/O worker #11] INFO  com.google.bitcoin.core.PeerGroup - Setting download peer: [180.154.69.185]:8333
+363747 [New I/O worker #11] INFO  c.g.bitcoin.core.DownloadListener - Downloading block chain of size 71. 
+363840 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278954/000000000000000260cb9281929e4ac48bb06ba2a4a9206f32aee058eebe34a9
+363842 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+375458 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 3 blocks per second
+375460 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 2% done with 69 blocks to go, block date Jan 6, 2014 4:44:16 PM
+376461 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278955/0000000000000002187764739ec539352101f8b923da3aab2a2938bd8af5c359
+376463 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+398218 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 4% done with 68 blocks to go, block date Jan 6, 2014 4:46:16 PM
+399218 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278956/0000000000000001d8b6259a52fd4b77188209f972e2a3d525887b30925c2ed2
+399220 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+404946 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 5% done with 67 blocks to go, block date Jan 6, 2014 5:02:05 PM
+405946 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278957/00000000000000004ecb9e17fc336ffd8d1fdd1c074a2e6c69d023c68f0aa3bb
+405947 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+412385 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 7% done with 66 blocks to go, block date Jan 6, 2014 5:16:38 PM
+413386 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278958/0000000000000000ed8a5f31656bafca5d17254dd99d8226ccbfc1a06d96d1e5
+413387 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+424819 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 8% done with 65 blocks to go, block date Jan 6, 2014 5:21:21 PM
+425819 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278959/0000000000000000f7d7b35dbc3d750166fe3b9c45e24a25dbed93fb4a28bf2f
+425820 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+436586 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 9% done with 64 blocks to go, block date Jan 6, 2014 5:42:08 PM
+437587 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278960/000000000000000009bc28e08b41a74801c5878bf87978c2486aee7ed8a85778
+437588 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+441930 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 11% done with 63 blocks to go, block date Jan 6, 2014 5:53:50 PM
+442931 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278961/00000000000000022b2fb9ef3011b88d9195b6ca967c9bf1b0391b3cb2abd71f
+442932 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+456939 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 12% done with 62 blocks to go, block date Jan 6, 2014 6:02:35 PM
+457939 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278962/00000000000000019cc5b7a9342bd1bf9a5585c991a56d9209c8652ac0c9ebff
+457941 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+467171 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 14% done with 61 blocks to go, block date Jan 6, 2014 6:03:14 PM
+468144 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 15% done with 60 blocks to go, block date Jan 6, 2014 6:08:05 PM
+468172 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278964/00000000000000013acf6d75dc32ccd89eeddb9552dda922790d7c286a85bf6c
+468174 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+472323 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+472324 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 16% done with 59 blocks to go, block date Jan 6, 2014 6:07:26 PM
+473133 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 18% done with 58 blocks to go, block date Jan 6, 2014 6:15:11 PM
+473324 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278966/000000000000000230411a2ab42f20a5b88475a32e4f66562d7ca7c6aac6e290
+473326 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+478526 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+478528 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 19% done with 57 blocks to go, block date Jan 6, 2014 6:16:30 PM
+479082 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 21% done with 56 blocks to go, block date Jan 6, 2014 6:23:39 PM
+479528 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278968/0000000000000002ca3fc10062bd5dae6f3c3878f755c352816e6963eba3172d
+479530 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+489121 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+489128 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 22% done with 55 blocks to go, block date Jan 6, 2014 6:32:50 PM
+490129 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278969/0000000000000002dc17e4d68331dbedbf22b24b5b6b0938c52dc1194940d623
+490130 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+497796 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 23% done with 54 blocks to go, block date Jan 6, 2014 6:49:38 PM
+498796 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278970/00000000000000006aa90ee1d0d7dc990e7a29d4656e73524408d33701e3d1e6
+498797 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+506304 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 25% done with 53 blocks to go, block date Jan 6, 2014 6:58:00 PM
+507305 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278971/00000000000000016a629480625dcf085a0f08e6ee3ffe2bb42044044f539f23
+507308 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 3msec
+512972 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 26% done with 52 blocks to go, block date Jan 6, 2014 6:59:20 PM
+513972 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278972/000000000000000141266b26e48de40c8d9f63de5805a615f7bf841e6b2c1982
+513974 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+517492 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 28% done with 51 blocks to go, block date Jan 6, 2014 7:04:22 PM
+518492 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278973/00000000000000012096d6e707222dfeef093c4907729bae167f6751fbe36dc0
+518494 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+524653 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 29% done with 50 blocks to go, block date Jan 6, 2014 7:15:45 PM
+525653 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278974/00000000000000014657fd86b72b2c5f9cf24dcb98c63075fd0ef5dbafd63f9b
+525655 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+531139 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 30% done with 49 blocks to go, block date Jan 6, 2014 7:29:58 PM
+532139 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278975/0000000000000001c0340e88bfa23ad8ec787944050bc404d87250aa4c2f2fa0
+532141 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+537591 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 32% done with 48 blocks to go, block date Jan 6, 2014 7:41:35 PM
+538592 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278976/000000000000000140460b26943c555f6529a419a6f74f3c569295e8c9c2e5d0
+538593 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+545306 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 33% done with 47 blocks to go, block date Jan 6, 2014 7:54:30 PM
+546306 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278977/0000000000000000cc803b291bdc02bb4468d3a5ed9a62d9be486607c1574a7c
+546307 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+557251 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 35% done with 46 blocks to go, block date Jan 6, 2014 7:54:44 PM
+558252 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278978/000000000000000230293d2d21057a291856b0081d66621ac2942cf46a9efff0
+558253 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+562962 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 36% done with 45 blocks to go, block date Jan 6, 2014 8:00:21 PM
+563963 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278979/0000000000000000bcee4124d5d1fe02878ff6683f388da686120211f269ed48
+563964 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+564730 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 38% done with 44 blocks to go, block date Jan 6, 2014 8:02:53 PM
+565731 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278980/000000000000000055303b99e4cc89835e28de3418e7ff3370b0f71b4e111a43
+565732 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+568783 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 39% done with 43 blocks to go, block date Jan 6, 2014 8:05:18 PM
+569783 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278981/0000000000000000d401d60b47aadf7b306f694c26d2857b618e6edafc323310
+569784 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+576903 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 40% done with 42 blocks to go, block date Jan 6, 2014 8:18:35 PM
+577903 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278982/00000000000000027038af8a0fb1d73d16618f400e06f33fd21f084aa9e73d53
+577905 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+606058 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 42% done with 41 blocks to go, block date Jan 6, 2014 8:58:32 PM
+607058 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278983/00000000000000011f83e5f9113ae66e8bc01155ee01ce95917a9930243b5d27
+607060 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+613405 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 43% done with 40 blocks to go, block date Jan 6, 2014 9:04:44 PM
+614406 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278984/00000000000000013b02ebb1900dd13a29cbd61648d5474c343c79d037649eca
+614408 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+616366 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 45% done with 39 blocks to go, block date Jan 6, 2014 9:07:48 PM
+617367 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278985/000000000000000293f30efe4d9ca305aa82faf748f58aded519698b90334426
+617368 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+622230 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 46% done with 38 blocks to go, block date Jan 6, 2014 9:12:57 PM
+623231 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278986/000000000000000011e46632600705915cfb6c7f975642f010152907ff1ecc43
+623232 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+627964 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 47% done with 37 blocks to go, block date Jan 6, 2014 9:23:08 PM
+628965 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278987/00000000000000025f3269b0e9c90feadca73aff40041361dc69d8560712bc74
+628967 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+632075 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 49% done with 36 blocks to go, block date Jan 6, 2014 9:29:22 PM
+633076 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278988/0000000000000002ffaf8fb43956b46e603d838abe67d2bbcb746298df094539
+633077 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+634846 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 50% done with 35 blocks to go, block date Jan 6, 2014 9:33:14 PM
+635846 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278989/00000000000000024e092083b89dad89d3d0eabc360c387ffbeda2465b3eb99c
+635847 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+640201 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 52% done with 34 blocks to go, block date Jan 6, 2014 9:37:22 PM
+641202 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278990/0000000000000001f315bfda4486f8436211f69e5f8f85909b2a85b5e0a0649d
+641204 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+644380 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 53% done with 33 blocks to go, block date Jan 6, 2014 9:41:44 PM
+645381 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278991/0000000000000001c6fef9a18263119c9507bd422e32b28c299f1d001b70c02d
+645383 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+645975 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 54% done with 32 blocks to go, block date Jan 6, 2014 9:43:09 PM
+646976 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278992/0000000000000000ccbc7917f9d15e1bd40c7ab3a4b2f93c364e899a9d275503
+646977 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+649875 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 56% done with 31 blocks to go, block date Jan 6, 2014 9:47:36 PM
+650875 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278993/00000000000000003e7aaa484b892a6d53953e4037b950c0e400a453f37c5d19
+650877 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+656953 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 57% done with 30 blocks to go, block date Jan 6, 2014 9:55:46 PM
+657953 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278994/00000000000000005581b5aaf924359e4e7d7df2ca6ff478535432fecd9706c4
+657955 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+670665 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 59% done with 29 blocks to go, block date Jan 6, 2014 9:58:40 PM
+671666 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278995/000000000000000173c16085a6271b65acd94b135eede4f604a79ec56bbb2ea4
+671668 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+676692 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 60% done with 28 blocks to go, block date Jan 6, 2014 10:10:00 PM
+677693 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278996/000000000000000039b01aebff23050a58d6c89591737b2e2a0261a445fd7d73
+677694 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+679675 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 61% done with 27 blocks to go, block date Jan 6, 2014 10:10:47 PM
+680675 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278997/000000000000000096dcdba5c931f66dbd4a48c3a91340ede73b173ca93fd98b
+680677 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+690187 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 63% done with 26 blocks to go, block date Jan 6, 2014 10:15:15 PM
+691188 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278998/0000000000000001b77f9839212c454d54b9ad433181631b15f1be36825d114f
+691189 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+694212 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 64% done with 25 blocks to go, block date Jan 6, 2014 10:15:38 PM
+695212 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 278999/0000000000000001ed51db67f98e83ac76209fe00dabc2a42c80cbc9a4ef6c45
+695214 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+700653 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 66% done with 24 blocks to go, block date Jan 6, 2014 10:31:11 PM
+701653 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279000/0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40
+701655 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+704514 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 67% done with 23 blocks to go, block date Jan 6, 2014 10:40:39 PM
+705194 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 69% done with 22 blocks to go, block date Jan 6, 2014 10:40:21 PM
+705515 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279002/0000000000000001ce248f7b081d3e28d83113ad1d87231b668968e93061f164
+705516 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+706814 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+706814 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 70% done with 21 blocks to go, block date Jan 6, 2014 10:41:39 PM
+707814 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279003/000000000000000120748800f911969d83f7c239764b0189cc7223b282069f16
+707816 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+713318 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 71% done with 20 blocks to go, block date Jan 6, 2014 10:43:30 PM
+714318 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279004/0000000000000001ead408bdc15dd1175281154ba7bf11c802ce3e4bee0584b4
+714320 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+715363 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 73% done with 19 blocks to go, block date Jan 6, 2014 10:46:52 PM
+716363 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279005/0000000000000002325173908a8ed61f96b20ad6a002444342bb7fe183e423df
+716365 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+721805 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 74% done with 18 blocks to go, block date Jan 6, 2014 11:09:22 PM
+722805 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279006/0000000000000002d4d7978986e518042bbeae2efee83fa8502b0f6af1de720b
+722807 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+726706 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 76% done with 17 blocks to go, block date Jan 6, 2014 11:10:56 PM
+727707 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279007/0000000000000002e6f7d49b7519e452146e2d79d08e78d18c33b0ed5374b4f9
+727708 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+731863 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 77% done with 16 blocks to go, block date Jan 6, 2014 11:18:18 PM
+732223 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 78% done with 15 blocks to go, block date Jan 6, 2014 11:18:34 PM
+732863 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279009/000000000000000147a162b6a408870f53aef73f1ea1e5871fd949a1e619b86c
+732864 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+733354 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+733354 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 80% done with 14 blocks to go, block date Jan 6, 2014 11:19:41 PM
+734354 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279010/00000000000000011f6fec68d101a6113abfaf707be7f3c5a472c6f442e9fc4e
+734356 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+738194 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 81% done with 13 blocks to go, block date Jan 6, 2014 11:22:47 PM
+739195 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279011/0000000000000002b88f6a3d9534181d0e2f5ffb67fc08e7a5fb792b448159f2
+739197 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+740605 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 83% done with 12 blocks to go, block date Jan 6, 2014 11:25:25 PM
+741415 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 84% done with 11 blocks to go, block date Jan 6, 2014 11:28:23 PM
+741606 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279013/0000000000000000386fb6e0f3b250eebc22128ef10cf91501bc6c091633c8e1
+741607 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+746594 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+746595 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 85% done with 10 blocks to go, block date Jan 6, 2014 11:36:52 PM
+747596 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279014/0000000000000001f2e29ecc811b8f595a490ec895731f8bbf2ba9c3772cf581
+747598 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+748725 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 87% done with 9 blocks to go, block date Jan 6, 2014 11:35:34 PM
+749726 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279015/0000000000000002d82dcabe235be8fb2232692233666f1e3a26a04fbcb35003
+749727 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+764078 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 88% done with 8 blocks to go, block date Jan 7, 2014 12:15:30 AM
+765078 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279016/0000000000000000977e56d6c0997d54b1b83c4e5bde4b5fccbe2098b4db4e00
+765080 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+773899 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 90% done with 7 blocks to go, block date Jan 7, 2014 12:20:02 AM
+774899 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279017/0000000000000002337caa7a38f06c8bdf4556a7d50adc5ea36abf70df1fbfa0
+774902 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 3msec
+781486 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 91% done with 6 blocks to go, block date Jan 7, 2014 12:28:41 AM
+782487 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279018/00000000000000008f5dbcabd5b7b1c74261cbba236ce99c501f87b49d84fc38
+782488 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+784916 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 92% done with 5 blocks to go, block date Jan 7, 2014 12:34:34 AM
+785430 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 94% done with 4 blocks to go, block date Jan 7, 2014 12:36:59 AM
+785917 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279020/00000000000000022a6b54ad27ed1386c8aceb479d5624222bc61995e52c92b4
+785919 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+788881 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+788882 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 95% done with 3 blocks to go, block date Jan 7, 2014 12:38:27 AM
+789633 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 97% done with 2 blocks to go, block date Jan 7, 2014 12:39:57 AM
+789882 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279022/000000000000000180bf65de40f02c779f46cdad55a1abb52b5790f598061725
+789884 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+794446 [New I/O worker #9] INFO  c.g.bitcoin.core.AbstractBlockChain - 2 blocks per second
+794447 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 98% done with 1 blocks to go, block date Jan 7, 2014 12:45:02 AM
+795448 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279023/00000000000000015691d330e6a19199dfd5e72dba1961a9e53563b695337e75
+795449 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 1msec
+796150 [New I/O worker #9] INFO  c.g.bitcoin.core.DownloadListener - Chain download 100% done with 0 blocks to go, block date Jan 7, 2014 12:45:57 AM
+797151 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279024/00000000000000009f36f19da29808850747b00bd4149f145712ab87d2717b16
+797153 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 2msec
+798712 [New I/O worker #9] WARN  c.g.bitcoin.core.AbstractBlockChain - Block does not connect: 000000000000000237cd23d88ed708dcfa3146c94ee9d5463bc52807ca8aebc7 prev 000000000000000261c68327edfc28c36f6137378157769a203b97ccba8bc4ea
+1360879 [New I/O worker #11] INFO  com.google.bitcoin.core.Peer - [192.0.143.26]:8333 - Socket is disconnected
+1360879 [New I/O worker #9] INFO  com.google.bitcoin.core.Peer - [180.154.69.185]:8333 - Socket is disconnected
+1360879 [New I/O worker #10] INFO  com.google.bitcoin.core.Peer - [88.192.246.174]:8333 - Socket is disconnected
+1360879 [New I/O worker #5] INFO  com.google.bitcoin.core.Peer - [109.235.49.27]:8333 - Socket is disconnected
+3976 [WalletAppKit STARTING] INFO  c.g.bitcoin.core.AbstractBlockChain - chain head is at height 279024:
+v2 block: 
+   previous block: 00000000000000015691d330e6a19199dfd5e72dba1961a9e53563b695337e75
+   merkle root: c8f91c4af60a23c50fd4efa70a0b60fd1968e860127911ccf3c1a67a5a7cd5b4
+   time: [1389055557] Tue Jan 07 00:45:57 UTC 2014
+   difficulty target (nBits): 419628831
+   nonce: 1074680677
+
+4516 [PeerGroup STARTING] INFO  com.google.bitcoin.core.PeerGroup - Peer discovery took 439msec
+4547 [PeerGroup STARTING] INFO  com.google.bitcoin.core.Peer - [2001:4801:7819:74:b745:b9d5:ff10:aaec]:8333 - No route to host
+4548 [New I/O worker #2] INFO  com.google.bitcoin.core.PeerGroup - [2001:4801:7819:74:b745:b9d5:ff10:aaec]:8333: Peer died
+4549 [PeerGroup STARTING] INFO  com.google.bitcoin.core.Peer - [2a01:4f8:101:4141:0:0:0:2]:8333 - No route to host
+4549 [New I/O worker #3] INFO  com.google.bitcoin.core.PeerGroup - [2a01:4f8:101:4141:0:0:0:2]:8333: Peer died
+4549 [New I/O worker #2] INFO  com.google.bitcoin.core.Peer - [2001:41d0:8:8f6b:0:0:0:1]:8333 - No route to host
+4549 [PeerGroup STARTING] INFO  com.google.bitcoin.core.Peer - [2001:da8:e000:1103:6ca1:2605:7b:58a3]:8333 - No route to host
+4549 [New I/O worker #4] INFO  com.google.bitcoin.core.PeerGroup - [2001:41d0:8:8f6b:0:0:0:1]:8333: Peer died
+4549 [New I/O worker #5] INFO  com.google.bitcoin.core.PeerGroup - [2001:da8:e000:1103:6ca1:2605:7b:58a3]:8333: Peer died
+4630 [New I/O worker #7] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bitcoin.dashjr.org/76.17.211.189:8333 as: /BitCoinJ:0.10.3/
+4654 [New I/O worker #8] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bitcoin.dashjr.org/66.56.41.123:8333 as: /BitCoinJ:0.10.3/
+4736 [New I/O worker #6] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bluematt.me/130.180.122.103:8333 as: /BitCoinJ:0.10.3/
+4809 [New I/O worker #8] INFO  c.g.b.core.TCPNetworkConnection - Connected to 66.56.41.123: version=70001, subVer='/Satoshi:0.8.5/', services=0x1, time=Tue Jan 07 01:17:00 UTC 2014, blocks=279026
+4825 [New I/O worker #7] INFO  c.g.b.core.TCPNetworkConnection - Connected to 76.17.211.189: version=70001, subVer='/Satoshi:0.8.3/', services=0x1, time=Tue Jan 07 01:16:58 UTC 2014, blocks=279026
+4893 [New I/O worker #8] INFO  com.google.bitcoin.core.PeerGroup - [66.56.41.123]:8333: New peer
+4894 [New I/O worker #8] INFO  com.google.bitcoin.core.PeerGroup - Setting download peer: [66.56.41.123]:8333
+4894 [New I/O worker #8] INFO  c.g.bitcoin.core.DownloadListener - Downloading block chain of size 2. 
+4923 [New I/O worker #7] INFO  com.google.bitcoin.core.PeerGroup - [76.17.211.189]:8333: New peer
+4924 [New I/O worker #6] INFO  com.google.bitcoin.core.PeerGroup - [130.180.122.103]:8333: Peer died
+4924 [New I/O worker #6] INFO  com.google.bitcoin.core.Peer - [2001:470:1f04:c04:0:0:0:2]:8333 - No route to host
+4925 [New I/O worker #9] INFO  com.google.bitcoin.core.PeerGroup - [2001:470:1f04:c04:0:0:0:2]:8333: Peer died
+5079 [New I/O worker #10] INFO  c.g.b.core.TCPNetworkConnection - Announcing to seed.bitcoin.sipa.be/108.7.68.190:8333 as: /BitCoinJ:0.10.3/
+5222 [New I/O worker #10] INFO  c.g.b.core.TCPNetworkConnection - Connected to 108.7.68.190: version=70001, subVer='/Satoshi:0.8.6/', services=0x1, time=Tue Jan 07 01:16:56 UTC 2014, blocks=279026
+5312 [New I/O worker #10] INFO  com.google.bitcoin.core.PeerGroup - [108.7.68.190]:8333: New peer
+6068 [New I/O worker #8] INFO  c.g.bitcoin.core.DownloadListener - Chain download 50% done with 1 blocks to go, block date Jan 7, 2014 12:55:19 AM
+6257 [New I/O worker #8] INFO  c.g.bitcoin.core.DownloadListener - Chain download 100% done with 0 blocks to go, block date Jan 7, 2014 12:58:43 AM
+6548 [New I/O worker #1] INFO  com.google.bitcoin.core.PeerGroup - [101.28.51.40]:8333: Peer died
+6548 [New I/O boss #17] INFO  com.google.bitcoin.core.Peer - [101.28.51.40]:8333 - connection timed out
+6549 [New I/O worker #1] INFO  com.google.bitcoin.core.Peer - [2001:470:7230:ffae:8c40:e0a7:d8f7:30c1]:8333 - No route to host
+6549 [New I/O worker #11] INFO  com.google.bitcoin.core.PeerGroup - [2001:470:7230:ffae:8c40:e0a7:d8f7:30c1]:8333: Peer died
+6763 [New I/O worker #12] INFO  c.g.b.core.TCPNetworkConnection - Announcing to dnsseed.bluematt.me/88.192.246.174:8333 as: /BitCoinJ:0.10.3/
+7068 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Background saving wallet, last seen block is 279026/000000000000000237cd23d88ed708dcfa3146c94ee9d5463bc52807ca8aebc7
+7075 [New I/O worker #12] INFO  c.g.b.core.TCPNetworkConnection - Connected to 88.192.246.174: version=70001, subVer='/Satoshi:0.8.6/', services=0x1, time=Tue Jan 07 01:17:02 UTC 2014, blocks=279026
+7075 [Wallet autosave thread] INFO  c.google.bitcoin.wallet.WalletFiles - Save completed in 7msec
+7283 [New I/O worker #12] INFO  com.google.bitcoin.core.PeerGroup - [88.192.246.174]:8333: New peer
+7284 [New I/O worker #12] INFO  com.google.bitcoin.core.PeerGroup - Unsetting download peer: [66.56.41.123]:8333
+7284 [New I/O worker #12] INFO  com.google.bitcoin.core.PeerGroup - Setting download peer: [108.7.68.190]:8333

diff --git a/server/killbill-bitcoin-testnet.spvchain b/server/killbill-bitcoin-testnet.spvchain
new file mode 100644
index 0000000..3076feb
Binary files /dev/null and b/server/killbill-bitcoin-testnet.spvchain differ

diff --git a/server/killbill-bitcoin-testnet.wallet b/server/killbill-bitcoin-testnet.wallet
new file mode 100644
index 0000000..8c67c72
Binary files /dev/null and b/server/killbill-bitcoin-testnet.wallet differ

diff --git a/server/src/main/resources/MichielCatalog.xml b/server/src/main/resources/MichielCatalog.xml
new file mode 100644
index 0000000..c96431e
--- /dev/null
+++ b/server/src/main/resources/MichielCatalog.xml
@@ -0,0 +1,369 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="CatalogSchema.xsd">
+
+    <effectiveDate>2013-02-08T00:00:00+00:00</effectiveDate>
+    <catalogName>basic catalog</catalogName>
+
+    <currencies>
+        <currency>EUR</currency>
+    </currencies>
+
+    <products>
+    
+        <product name="instance-m1.tiny">
+            <category>BASE</category>
+        </product>
+        <product name="instance-m1.small">
+            <category>BASE</category>
+        </product>
+        <product name="instance-m1.medium">
+            <category>BASE</category>
+        </product>
+        <product name="instance-m1.large">
+            <category>BASE</category>
+        </product>
+        <product name="instance-m1.xlarge">
+            <category>BASE</category>
+        </product>
+        <product name="instance-m1.micro">
+            <category>BASE</category>
+        </product>
+        <product name="instance-m1.micro2">
+            <category>BASE</category>
+        </product>
+
+        <product name="objectstore-1GB">
+            <category>BASE</category>
+        </product>
+        <product name="objectstore-5GB">
+            <category>BASE</category>
+        </product>
+        <product name="objectstore-10GB">
+            <category>BASE</category>
+        </product>
+
+        <product name="floatingip">
+            <category>BASE</category>
+        </product>
+        
+        <product name="volume-1GB">
+            <category>BASE</category>
+        </product>
+        <product name="volume-2GB">
+            <category>BASE</category>
+        </product>
+        <product name="volume-3GB">
+            <category>BASE</category>
+        </product>
+        <product name="volume-4GB">
+            <category>BASE</category>
+        </product>
+        <product name="volume-5GB">
+            <category>BASE</category>
+        </product>
+
+    </products>
+
+    <rules>
+        <changePolicy>
+            <changePolicyCase>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+        </changePolicy>
+        <changeAlignment>
+           <changeAlignmentCase>
+                <alignment>START_OF_BUNDLE</alignment>
+            </changeAlignmentCase>
+        </changeAlignment>
+        <cancelPolicy>
+            <cancelPolicyCase>
+                <policy>IMMEDIATE</policy>
+            </cancelPolicyCase>
+        </cancelPolicy>
+        <createAlignment>
+            <createAlignmentCase>
+                <alignment>START_OF_BUNDLE</alignment>
+            </createAlignmentCase>
+        </createAlignment>
+        <billingAlignment>
+            <billingAlignmentCase>
+                <alignment>ACCOUNT</alignment>
+            </billingAlignmentCase>
+        </billingAlignment>
+        <priceList>
+           <priceListCase>
+                <toPriceList>DEFAULT</toPriceList>
+           </priceListCase>
+        </priceList>
+    </rules>
+
+    <plans>
+        <plan name="instance-m1.tiny-monthly">
+            <product>instance-m1.tiny</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>12.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="instance-m1.small-monthly">
+            <product>instance-m1.small</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>18.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="instance-m1.medium-monthly">
+            <product>instance-m1.medium</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>23.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="instance-m1.large-monthly">
+            <product>instance-m1.large</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>39.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="instance-m1.xlarge-monthly">
+            <product>instance-m1.xlarge</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>79.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="instance-m1.micro-monthly">
+            <product>instance-m1.micro</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>5.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="instance-m1.micro2-monthly">
+            <product>instance-m1.micro2</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>7.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+
+        <plan name="objectstore-1GB-monthly">
+            <product>objectstore-1GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>2.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="objectstore-5GB-monthly">
+            <product>objectstore-5GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>3.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="objectstore-10GB-monthly">
+            <product>objectstore-10GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>4.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+
+        <plan name="floatingip-monthly">
+            <product>floatingip</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>4.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        
+        <plan name="volume-1GB-monthly">
+            <product>volume-1GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>1.50</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="volume-2GB-monthly">
+            <product>volume-2GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>2.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="volume-3GB-monthly">
+            <product>volume-3GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>2.50</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="volume-4GB-monthly">
+            <product>volume-4GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>3.00</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+        <plan name="volume-5GB-monthly">
+            <product>volume-5GB</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <billingPeriod>MONTHLY</billingPeriod>
+                <recurringPrice>
+                    <price>
+                        <currency>EUR</currency>
+                        <value>3.50</value>
+                    </price>
+                </recurringPrice>
+            </finalPhase>
+        </plan>
+
+    </plans>
+    <priceLists>
+        <defaultPriceList name="DEFAULT">
+            <plans>
+                <plan>instance-m1.tiny-monthly</plan>
+                <plan>instance-m1.small-monthly</plan>
+                <plan>instance-m1.medium-monthly</plan>
+                <plan>instance-m1.large-monthly</plan>
+                <plan>instance-m1.xlarge-monthly</plan>
+                <plan>instance-m1.micro-monthly</plan>
+                <plan>instance-m1.micro2-monthly</plan>
+                <plan>objectstore-1GB-monthly</plan>
+                <plan>objectstore-5GB-monthly</plan>
+                <plan>objectstore-10GB-monthly</plan>
+                <plan>floatingip-monthly</plan>
+                <plan>volume-1GB-monthly</plan>
+                <plan>volume-2GB-monthly</plan>
+                <plan>volume-3GB-monthly</plan>
+                <plan>volume-4GB-monthly</plan>
+                <plan>volume-5GB-monthly</plan>
+            </plans>
+        </defaultPriceList>
+    </priceLists>
+</catalog>
\ No newline at end of file

diff --git a/server/src/main/resources/NitinCatalog.xml b/server/src/main/resources/NitinCatalog.xml
new file mode 100644
index 0000000..1b86525
--- /dev/null
+++ b/server/src/main/resources/NitinCatalog.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
+
+	<effectiveDate>2013-10-01T00:00:00+00:00</effectiveDate>
+	<catalogName>aclcatalog</catalogName>
+
+	<currencies>
+		<currency>USD</currency>
+		<currency>INR</currency>
+		<currency>GBP</currency>
+	</currencies>
+
+   <units>
+       <unit name="shells"/>
+   </units>
+
+	<products>
+		<product name="frenzo-usage">
+			<category>BASE</category>
+           <included>
+           <addonProduct>gift</addonProduct>
+           </included>
+            <available>
+               <addonProduct>extra-gift</addonProduct>
+       </available>
+		</product>
+		<product name="frenzo-mini">
+			<category>BASE</category>
+               <limits>
+                   <limit>
+                       <unit>shells</unit>
+                       <max>5</max>
+                   </limit>
+               </limits>
+		</product>
+		<product name="gift">
+			<category>ADD_ON</category>
+		</product>
+       <product name="extra-gift">
+           <category>ADD_ON</category>
+       </product>
+	</products>
+	 
+	<rules>
+		<changePolicy>
+			<changePolicyCase> 
+				<fromBillingPeriod>MONTHLY</fromBillingPeriod>
+				<toProduct>frenzo-mini</toProduct>
+				<toBillingPeriod>MONTHLY</toBillingPeriod>
+				<policy>END_OF_TERM</policy>
+			</changePolicyCase>
+			<changePolicyCase> 
+				<phaseType>EVERGREEN</phaseType>
+				<policy>IMMEDIATE</policy>
+			</changePolicyCase>	
+		</changePolicy>
+       <changeAlignment>
+           <changeAlignmentCase>
+               <alignment>START_OF_SUBSCRIPTION</alignment>
+           </changeAlignmentCase>
+       </changeAlignment>
+       <createAlignment>
+           <createAlignmentCase>
+               <product>gift</product>
+               <alignment>START_OF_SUBSCRIPTION</alignment>
+           </createAlignmentCase>
+           <createAlignmentCase>
+               <alignment>START_OF_SUBSCRIPTION</alignment>
+           </createAlignmentCase>
+       </createAlignment>
+       <billingAlignment>
+           <billingAlignmentCase>
+               <alignment>ACCOUNT</alignment>
+           </billingAlignmentCase>
+       </billingAlignment>
+       <priceList>
+          <priceListCase>
+               <toPriceList>DEFAULT</toPriceList>
+          </priceListCase>
+       </priceList>
+	</rules> 
+
+	<plans>
+		<plan name="frenzo-usage-monthly">
+			<product>frenzo-usage</product>
+			<!--<initialPhases>
+				<phase type="TRIAL">
+					<duration>
+						<unit>DAYS</unit>
+						<number>1</number>
+					</duration>
+					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
+					<fixedPrice> 
+					</fixedPrice>
+				</phase>
+			</initialPhases>-->
+			<finalPhase type="EVERGREEN">
+				<duration>
+					<unit>UNLIMITED</unit>
+				</duration>
+				<billingPeriod>MONTHLY</billingPeriod>
+				<recurringPrice>
+					<price><currency>GBP</currency><value>29.95</value></price>
+					<price><currency>INR</currency><value>5</value></price> 
+					<price><currency>USD</currency><value>29.95</value></price>								
+				</recurringPrice>
+              <!-- <limits>
+                   <limit>
+                       <unit>targets</unit>
+                       <min>3</min>
+                   </limit>
+                   <limit>
+                       <unit>misfires</unit>
+                       <max>20</max>
+                   </limit>
+               </limits>-->
+			</finalPhase>
+		</plan>
+		<plan name="frenzo-mini-monthly">
+			<product>frenzo-mini</product>
+			<!--<initialPhases>
+				<phase type="TRIAL">
+					<duration>
+						<unit>DAYS</unit>
+						<number>30</number>
+					</duration>
+					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
+					<fixedPrice></fixedPrice>
+				   
+				</phase>
+			</initialPhases>-->
+			<finalPhase type="EVERGREEN">
+				<duration>
+					<unit>UNLIMITED</unit>
+					<number>-1</number>
+				</duration>
+				<billingPeriod>MONTHLY</billingPeriod>
+				<recurringPrice>
+					<price><currency>USD</currency><value>249.95</value></price>								
+					<price><currency>INR</currency><value>1</value></price>
+					<price><currency>GBP</currency><value>169.95</value></price>
+				</recurringPrice>
+			</finalPhase>
+		</plan>
+       <plan name="gift-monthly">
+       <product>gift</product>
+           <finalPhase type="EVERGREEN">
+               <duration>
+                   <unit>UNLIMITED</unit>
+               </duration>
+               <billingPeriod>MONTHLY</billingPeriod>
+               <recurringPrice>
+                   <price><currency>USD</currency><value>1999.95</value></price>                               
+                   <price><currency>INR</currency><value>2</value></price>
+                   <price><currency>GBP</currency><value>1999.95</value></price>
+               </recurringPrice>
+           </finalPhase>
+       </plan>
+       <plan name="extra-gift-monthly">
+       <product>extra-gift</product>
+           <finalPhase type="EVERGREEN">
+               <duration>
+                   <unit>UNLIMITED</unit>
+               </duration>
+               <billingPeriod>MONTHLY</billingPeriod>
+               <recurringPrice>
+                   <price><currency>USD</currency><value>1999.95</value></price>                               
+                   <price><currency>INR</currency><value>5</value></price>
+                   <price><currency>GBP</currency><value>1999.95</value></price>
+               </recurringPrice>
+           </finalPhase>
+       </plan>
+	</plans>
+	<priceLists>
+		<defaultPriceList name="DEFAULT">
+				<plans>	
+					<plan>frenzo-usage-monthly</plan>
+					<plan>frenzo-mini-monthly</plan>
+			</plans>
+		</defaultPriceList>
+	</priceLists>
+</catalog>
+

diff --git a/server/src/main/resources/SpyCarAdvanced.xml b/server/src/main/resources/SpyCarAdvanced.xml
index e11a107..de7d4a6 100644
--- a/server/src/main/resources/SpyCarAdvanced.xml
+++ b/server/src/main/resources/SpyCarAdvanced.xml
@@ -153,38 +153,41 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>ANNUAL</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>750.00</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>850.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>1000.00</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>100.00</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>1.0</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>750.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>850.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1000.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>1.0</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="standard-monthly">
@@ -195,38 +198,41 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>75.00</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>85.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>100.00</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>10.00</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>0.1</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>75.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>85.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>10.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.1</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="sports-monthly">
@@ -237,38 +243,41 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>375.00</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>425.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>500.00</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>50.00</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>0.5</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>375.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>425.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>500.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>50.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>0.5</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="super-monthly">
@@ -279,38 +288,41 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>750.00</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>850.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>1000.00</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>100.00</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>1.0</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>750.00</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>850.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1000.00</value>
+                        </price>
+                        <price>
+                            <currency>JPY</currency>
+                            <value>100.00</value>
+                        </price>
+                        <price>
+                            <currency>BTC</currency>
+                            <value>1.0</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="discount-standard-monthly">
@@ -321,67 +333,72 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>3</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>50.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>60.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>66.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>6.60</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.06</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>50.00</value>
+                            <value>75.00</value>
                         </price>
                         <price>
                             <currency>EUR</currency>
-                            <value>60.00</value>
+                            <value>85.00</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>66.00</value>
+                            <value>100.00</value>
                         </price>
                         <price>
                             <currency>JPY</currency>
-                            <value>6.60</value>
+                            <value>10.00</value>
                         </price>
                         <price>
                             <currency>BTC</currency>
-                            <value>0.06</value>
+                            <value>0.1</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>75.00</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>85.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>100.00</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>10.00</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>0.1</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="discount-sports-monthly">
@@ -392,67 +409,72 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>3</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>250.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>300.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>333.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>33.30</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.3</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>250.00</value>
+                            <value>375.00</value>
                         </price>
                         <price>
                             <currency>EUR</currency>
-                            <value>300.00</value>
+                            <value>425.00</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>333.00</value>
+                            <value>500.00</value>
                         </price>
                         <price>
                             <currency>JPY</currency>
-                            <value>33.30</value>
+                            <value>50.00</value>
                         </price>
                         <price>
                             <currency>BTC</currency>
-                            <value>0.3</value>
+                            <value>0.5</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>375.00</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>425.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>500.00</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>50.00</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>0.5</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="discount-super-monthly">
@@ -463,67 +485,72 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
                 <phase type="DISCOUNT">
                     <duration>
                         <unit>MONTHS</unit>
                         <number>3</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>500.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>600.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>666.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>66.60</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.6</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>500.00</value>
+                            <value>750.00</value>
                         </price>
                         <price>
                             <currency>EUR</currency>
-                            <value>600.00</value>
+                            <value>850.00</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>666.00</value>
+                            <value>1000.00</value>
                         </price>
                         <price>
                             <currency>JPY</currency>
-                            <value>66.60</value>
+                            <value>100.00</value>
                         </price>
                         <price>
                             <currency>BTC</currency>
-                            <value>0.6</value>
+                            <value>1.0</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>750.00</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>850.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>1000.00</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>100.00</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>1.0</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="oilslick-monthly">
@@ -534,54 +561,58 @@
                         <unit>MONTHS</unit>
                         <number>1</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>2.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>3.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>4.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>0.40</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.01</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>2.00</value>
-                        </price>
-                        <price>
-                            <currency>EUR</currency>
-                            <value>3.00</value>
+                            <value>5.95</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>4.00</value>
+                            <value>7.95</value>
                         </price>
                         <price>
                             <currency>JPY</currency>
-                            <value>0.40</value>
+                            <value>0.80</value>
                         </price>
                         <price>
                             <currency>BTC</currency>
                             <value>0.01</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>5.95</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>7.95</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>0.80</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>0.01</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="remotecontrol-monthly">
@@ -592,58 +623,62 @@
                         <unit>MONTHS</unit>
                         <number>1</number>
                     </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>5.00</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>7.00</value>
+                            </price>
+                            <price>
+                                <currency>USD</currency>
+                                <value>8.00</value>
+                            </price>
+                            <price>
+                                <currency>JPY</currency>
+                                <value>0.80</value>
+                            </price>
+                            <price>
+                                <currency>BTC</currency>
+                                <value>0.01</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
                     <billingPeriod>MONTHLY</billingPeriod>
                     <recurringPrice>
                         <price>
                             <currency>GBP</currency>
-                            <value>5.00</value>
+                            <value>15.95</value>
                         </price>
                         <price>
                             <currency>EUR</currency>
-                            <value>7.00</value>
+                            <value>16.95</value>
                         </price>
                         <price>
                             <currency>USD</currency>
-                            <value>8.00</value>
+                            <value>17.95</value>
                         </price>
                         <price>
                             <currency>JPY</currency>
-                            <value>0.80</value>
+                            <value>1.79</value>
                         </price>
                         <price>
                             <currency>BTC</currency>
                             <value>0.01</value>
                         </price>
                     </recurringPrice>
-                </phase>
-            </initialPhases>
-            <finalPhase type="EVERGREEN">
-                <duration>
-                    <unit>UNLIMITED</unit>
-                </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>15.95</value>
-                    </price>
-                    <price>
-                        <currency>EUR</currency>
-                        <value>16.95</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>17.95</value>
-                    </price>
-                    <price>
-                        <currency>JPY</currency>
-                        <value>1.79</value>
-                    </price>
-                    <price>
-                        <currency>BTC</currency>
-                        <value>0.01</value>
-                    </price>
-                </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
     </plans>

diff --git a/server/src/main/resources/SpyCarBasic.xml b/server/src/main/resources/SpyCarBasic.xml
index 7db7465..9e59993 100644
--- a/server/src/main/resources/SpyCarBasic.xml
+++ b/server/src/main/resources/SpyCarBasic.xml
@@ -16,7 +16,7 @@
   -->
 
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
     <effectiveDate>2013-02-08T00:00:00+00:00</effectiveDate>
     <catalogName>SpyCarBasic</catalogName>
@@ -45,7 +45,7 @@
             </changePolicyCase>
         </changePolicy>
         <changeAlignment>
-           <changeAlignmentCase>
+            <changeAlignmentCase>
                 <alignment>START_OF_BUNDLE</alignment>
             </changeAlignmentCase>
         </changeAlignment>
@@ -65,9 +65,9 @@
             </billingAlignmentCase>
         </billingAlignment>
         <priceList>
-           <priceListCase>
+            <priceListCase>
                 <toPriceList>DEFAULT</toPriceList>
-           </priceListCase>
+            </priceListCase>
         </priceList>
     </rules>
 
@@ -80,26 +80,30 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>75.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>100.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>75.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>100.00</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="sports-monthly">
@@ -110,26 +114,29 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>375.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>500.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>375.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>500.00</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
         <plan name="super-monthly">
@@ -140,26 +147,30 @@
                         <unit>DAYS</unit>
                         <number>30</number>
                     </duration>
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <fixedPrice> <!-- empty price implies $0 -->
-                    </fixedPrice>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+
+                    </fixed>
                 </phase>
             </initialPhases>
             <finalPhase type="EVERGREEN">
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <billingPeriod>MONTHLY</billingPeriod>
-                <recurringPrice>
-                    <price>
-                        <currency>GBP</currency>
-                        <value>750.00</value>
-                    </price>
-                    <price>
-                        <currency>USD</currency>
-                        <value>1000.00</value>
-                    </price>
-                </recurringPrice>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>750.00</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1000.00</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
             </finalPhase>
         </plan>
     </plans>

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/alignment/PlanAligner.java b/subscription/src/main/java/org/killbill/billing/subscription/alignment/PlanAligner.java
index c219b7c..27bc7e6 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/alignment/PlanAligner.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/alignment/PlanAligner.java
@@ -195,7 +195,7 @@ public class PlanAligner extends BaseAligner {
 
         final PlanSpecifier planSpecifier = new PlanSpecifier(plan.getProduct().getName(),
                                                               plan.getProduct().getCategory(),
-                                                              plan.getBillingPeriod(),
+                                                              plan.getRecurringBillingPeriod(),
                                                               priceList);
 
         final DateTime planStartDate;
@@ -246,13 +246,13 @@ public class PlanAligner extends BaseAligner {
         final ProductCategory currentCategory = currentPlan.getProduct().getCategory();
         final PlanPhaseSpecifier fromPlanPhaseSpecifier = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
                                                                                  currentCategory,
-                                                                                 currentPlan.getBillingPeriod(),
+                                                                                 currentPlan.getRecurringBillingPeriod(),
                                                                                  currentPriceList,
                                                                                  currentPhase.getPhaseType());
 
         final PlanSpecifier toPlanSpecifier = new PlanSpecifier(nextPlan.getProduct().getName(),
                                                                 nextPlan.getProduct().getCategory(),
-                                                                nextPlan.getBillingPeriod(),
+                                                                nextPlan.getRecurringBillingPeriod(),
                                                                 priceList);
 
         final DateTime planStartDate;

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
index 9435853..d82a0e1 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
@@ -374,7 +374,7 @@ public class DefaultSubscriptionInternalApi extends SubscriptionApiBase implemen
             final EntitlementAOStatusDryRun status = new DefaultSubscriptionStatusDryRun(cur.getId(),
                                                                                          cur.getCurrentPlan().getProduct().getName(),
                                                                                          cur.getCurrentPhase().getPhaseType(),
-                                                                                         cur.getCurrentPlan().getBillingPeriod(),
+                                                                                         cur.getCurrentPlan().getRecurringBillingPeriod(),
                                                                                          cur.getCurrentPriceList().getName(), reason);
             result.add(status);
         }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java b/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
index 81447ed..3517577 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
@@ -23,6 +23,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 import org.joda.time.DateTime;
 
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -30,6 +32,7 @@ import org.killbill.billing.catalog.api.Catalog;
 import org.killbill.billing.catalog.api.CatalogApiException;
 import org.killbill.billing.catalog.api.PhaseType;
 import org.killbill.billing.catalog.api.Plan;
+import org.killbill.billing.catalog.api.PlanPhase;
 import org.killbill.billing.catalog.api.PlanPhaseSpecifier;
 import org.killbill.billing.catalog.api.ProductCategory;
 import org.killbill.billing.subscription.api.SubscriptionBaseTransitionType;
@@ -78,6 +81,14 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
         this.activeVersion = input.getActiveVersion();
     }
 
+    private BillingPeriod getBillingPeriod(final Catalog catalog, @Nullable final String phaseName, final DateTime effectiveDate, DateTime startDate) throws CatalogApiException {
+        if (phaseName == null) {
+            return BillingPeriod.NO_BILLING_PERIOD;
+        }
+        final PlanPhase phase = catalog.findPhase(phaseName, effectiveDate, startDate);
+        return phase.getRecurring() != null ? phase.getRecurring().getBillingPeriod() : BillingPeriod.NO_BILLING_PERIOD;
+    }
+
     private List<ExistingEvent> toExistingEvents(final Catalog catalog, final long activeVersion, final ProductCategory category, final List<SubscriptionBaseEvent> events)
             throws CatalogApiException {
 
@@ -115,7 +126,7 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
                     planPhaseName = phaseEV.getPhase();
                     phaseType = catalog.findPhase(phaseEV.getPhase(), cur.getEffectiveDate(), startDate).getPhaseType();
                     productName = prevProductName;
-                    billingPeriod = catalog.findPhase(phaseEV.getPhase(), cur.getEffectiveDate(), startDate).getBillingPeriod();
+                    billingPeriod = getBillingPeriod(catalog, phaseEV.getPhase(), cur.getEffectiveDate(), startDate);
                     priceListName = prevPriceListName;
                     break;
 
@@ -126,7 +137,7 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
                     final Plan plan = (userEV.getEventPlan() != null) ? catalog.findPlan(userEV.getEventPlan(), cur.getRequestedDate(), startDate) : null;
                     phaseType = (userEV.getEventPlanPhase() != null) ? catalog.findPhase(userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate).getPhaseType() : prevPhaseType;
                     productName = (plan != null) ? plan.getProduct().getName() : prevProductName;
-                    billingPeriod = (userEV.getEventPlanPhase() != null) ? catalog.findPhase(userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate).getBillingPeriod() : prevBillingPeriod;
+                    billingPeriod = getBillingPeriod(catalog, userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate);
                     priceListName = (userEV.getPriceList() != null) ? userEV.getPriceList() : prevPriceListName;
                     break;
             }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java
index 285899c..3814305 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java
@@ -314,9 +314,9 @@ public class DefaultSubscriptionBase extends EntityBase implements SubscriptionB
     public BillingPeriod getLastActiveBillingPeriod() {
         if (getState() == EntitlementState.CANCELLED) {
             final SubscriptionBaseTransition data = getPreviousTransition();
-            return data.getPreviousPlan().getBillingPeriod();
+            return data.getPreviousPlan().getRecurringBillingPeriod();
         } else {
-            return getCurrentPlan().getBillingPeriod();
+            return getCurrentPlan().getRecurringBillingPeriod();
         }
     }
 

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
index ba1ea44..32199b0 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
@@ -179,7 +179,7 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         final Plan currentPlan = subscription.getCurrentPlan();
         final PlanPhaseSpecifier planPhase = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
                                                                     currentPlan.getProduct().getCategory(),
-                                                                    subscription.getCurrentPlan().getBillingPeriod(),
+                                                                    subscription.getCurrentPlan().getRecurringBillingPeriod(),
                                                                     subscription.getCurrentPriceList().getName(),
                                                                     subscription.getCurrentPhase().getPhaseType());
 
@@ -331,7 +331,7 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
             final PriceList currentPriceList = subscription.getCurrentPriceList();
             final PlanPhaseSpecifier fromPlanPhase = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
                                                                             currentPlan.getProduct().getCategory(),
-                                                                            currentPlan.getBillingPeriod(),
+                                                                            currentPlan.getRecurringBillingPeriod(),
                                                                             currentPriceList.getName(),
                                                                             subscription.getCurrentPhase().getPhaseType());
             final PlanSpecifier toPlanPhase = new PlanSpecifier(productName,
@@ -391,7 +391,7 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         }
 
         final boolean isChangeImmediate = subscription.getCurrentPlan().getProduct().getName().equals(newProductName) &&
-                                          subscription.getCurrentPlan().getBillingPeriod() == newBillingPeriod;
+                                          subscription.getCurrentPlan().getRecurringBillingPeriod() == newBillingPeriod;
         return effectiveDate;
     }
 

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairBP.java b/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairBP.java
index 6473cd9..a7c6624 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairBP.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairBP.java
@@ -170,7 +170,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), baseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         final PlanPhase currentPhase = dryRunBaseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -255,7 +255,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), newBaseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -341,7 +341,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), baseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         PlanPhase currentPhase = dryRunBaseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -381,7 +381,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), newBaseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         currentPhase = realRunBaseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -425,7 +425,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), newBaseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -512,7 +512,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), baseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         PlanPhase currentPhase = dryRunBaseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -550,7 +550,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), newBaseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         currentPhase = realRunBaseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -588,7 +588,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Shotgun");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         final DateTime repairTime = clock.getUTCNow().minusDays(1);
         final BundleBaseTimeline bundleRepair = repairApi.getBundleTimeline(bundle.getId(), callContext);
@@ -620,7 +620,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Assault-Rifle");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         final PlanPhase currentPhase = baseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairWithAO.java b/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairWithAO.java
index 19346a2..f5d10a9 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairWithAO.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/timeline/TestRepairWithAO.java
@@ -704,7 +704,7 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Laser-Scope");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.ADD_ON);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         PlanPhase currentPhase = newAoSubscription.getCurrentPhase();
         assertNotNull(currentPhase);

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiAddOn.java b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiAddOn.java
index aa8003e..5daba7c 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiAddOn.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiAddOn.java
@@ -444,7 +444,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(aoCurrentPlan);
         assertEquals(aoCurrentPlan.getProduct().getName(), aoProduct);
         assertEquals(aoCurrentPlan.getProduct().getCategory(), ProductCategory.ADD_ON);
-        assertEquals(aoCurrentPlan.getBillingPeriod(), aoTerm);
+        assertEquals(aoCurrentPlan.getRecurringBillingPeriod(), aoTerm);
 
         PlanPhase aoCurrentPhase = aoSubscription.getCurrentPhase();
         assertNotNull(aoCurrentPhase);
@@ -477,7 +477,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(aoCurrentPlan);
         assertEquals(aoCurrentPlan.getProduct().getName(), aoProduct);
         assertEquals(aoCurrentPlan.getProduct().getCategory(), ProductCategory.ADD_ON);
-        assertEquals(aoCurrentPlan.getBillingPeriod(), aoTerm);
+        assertEquals(aoCurrentPlan.getRecurringBillingPeriod(), aoTerm);
 
         aoCurrentPhase = aoSubscription.getCurrentPhase();
         assertNotNull(aoCurrentPhase);

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiChangePlan.java b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiChangePlan.java
index 34c9126..3699306 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiChangePlan.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiChangePlan.java
@@ -50,7 +50,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), expProduct);
         assertEquals(currentPlan.getProduct().getCategory(), expCategory);
-        assertEquals(currentPlan.getBillingPeriod(), expBillingPeriod);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), expBillingPeriod);
 
         final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -298,7 +298,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Assault-Rifle");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -340,7 +340,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Assault-Rifle");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -356,7 +356,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Pistol");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -373,7 +373,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Pistol");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -402,7 +402,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Assault-Rifle");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.ANNUAL);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
 
         trialPhase = subscription.getCurrentPhase();
         assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java
index 22eeaba..f479f79 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java
@@ -144,7 +144,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), productName);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
@@ -178,7 +178,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), productName);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
-        assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(currentPlan.getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
 
         final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiError.java b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiError.java
index ed778b4..724360c 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiError.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiError.java
@@ -122,13 +122,13 @@ public class TestUserApiError extends SubscriptionTestSuiteNoDB {
             Assert.fail();
         } catch (SubscriptionBaseError error) {
             assertTrue(true);
-            assertEquals(subscriptionInternalApi.getSubscriptionFromId(subscription.getId(), internalCallContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+            assertEquals(subscriptionInternalApi.getSubscriptionFromId(subscription.getId(), internalCallContext).getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.ANNUAL);
         }
 
         // Assume the call takes less than a second
         assertEquals(DefaultClock.truncateMs(subscription.changePlanWithPolicy("Shotgun", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, BillingActionPolicy.IMMEDIATE, callContext)),
                      DefaultClock.truncateMs(clock.getUTCNow()));
-        assertEquals(subscriptionInternalApi.getSubscriptionFromId(subscription.getId(), internalCallContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+        assertEquals(subscriptionInternalApi.getSubscriptionFromId(subscription.getId(), internalCallContext).getCurrentPlan().getRecurringBillingPeriod(), BillingPeriod.MONTHLY);
     }
 
     @Test(groups = "fast")

diff --git a/subscription/src/test/resources/testInput.xml b/subscription/src/test/resources/testInput.xml
index 973afd0..7a4f468 100644
--- a/subscription/src/test/resources/testInput.xml
+++ b/subscription/src/test/resources/testInput.xml
@@ -17,812 +17,870 @@
 	and a one off (refurbish-maintenance) Phan with more than 2 phase (gunclub 
 	discount plans) Use Cases to do: Tiered Add On Riskfree period -->
 <catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
+         xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
 
-	<effectiveDate>2011-01-01T00:00:00+00:00</effectiveDate>
-	<catalogName>Firearms</catalogName>
+    <effectiveDate>2011-01-01T00:00:00+00:00</effectiveDate>
+    <catalogName>Firearms</catalogName>
 
-	<currencies>
-		<currency>USD</currency>
-		<currency>EUR</currency>
-		<currency>GBP</currency>
-	</currencies>
+    <currencies>
+        <currency>USD</currency>
+        <currency>EUR</currency>
+        <currency>GBP</currency>
+    </currencies>
 
-	<products>
-		<product name="Pistol">
-			<category>BASE</category>
-		</product>
-		<product name="Shotgun">
-			<category>BASE</category>
-			<available>
-				<addonProduct>Telescopic-Scope</addonProduct>
-				<addonProduct>Laser-Scope</addonProduct>
-			</available>
-		</product>
-		<product name="Assault-Rifle">
-			<category>BASE</category>
-			<included>
-				<addonProduct>Telescopic-Scope</addonProduct>
-			</included>
-			<available>
-				<addonProduct>Laser-Scope</addonProduct>
-			</available>
-		</product>
-		<product name="Telescopic-Scope">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Laser-Scope">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Holster">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Extra-Ammo">
-			<category>ADD_ON</category>
-		</product>
-		<product name="Refurbish-Maintenance">
-			<category>ADD_ON</category>
-		</product>
-	</products>
+    <products>
+        <product name="Pistol">
+            <category>BASE</category>
+        </product>
+        <product name="Shotgun">
+            <category>BASE</category>
+            <available>
+                <addonProduct>Telescopic-Scope</addonProduct>
+                <addonProduct>Laser-Scope</addonProduct>
+            </available>
+        </product>
+        <product name="Assault-Rifle">
+            <category>BASE</category>
+            <included>
+                <addonProduct>Telescopic-Scope</addonProduct>
+            </included>
+            <available>
+                <addonProduct>Laser-Scope</addonProduct>
+            </available>
+        </product>
+        <product name="Telescopic-Scope">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Laser-Scope">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Holster">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Extra-Ammo">
+            <category>ADD_ON</category>
+        </product>
+        <product name="Refurbish-Maintenance">
+            <category>ADD_ON</category>
+        </product>
+    </products>
 
-	<rules>
-		<changePolicy>
-			<changePolicyCase>
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>
-                       <changePolicyCase>
-                                <toPriceList>rescue</toPriceList>
-                                <policy>END_OF_TERM</policy>
-                        </changePolicyCase>
-			<changePolicyCase>
-				<toProduct>Assault-Rifle</toProduct>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>
-			<changePolicyCase>
-				<fromProduct>Pistol</fromProduct>
-				<toProduct>Shotgun</toProduct>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>
-			<changePolicyCase>
-				<fromBillingPeriod>MONTHLY</fromBillingPeriod>
-				<toBillingPeriod>ANNUAL</toBillingPeriod>
-				<policy>IMMEDIATE</policy>
-			</changePolicyCase>
-			<changePolicyCase>
-				<fromBillingPeriod>ANNUAL</fromBillingPeriod>
-				<toBillingPeriod>MONTHLY</toBillingPeriod>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-			<changePolicyCase>
-				<policy>END_OF_TERM</policy>
-			</changePolicyCase>
-		</changePolicy>
-		<changeAlignment>
-			<changeAlignmentCase>
-				<toPriceList>rescue</toPriceList>
-				<alignment>CHANGE_OF_PLAN</alignment>
-			</changeAlignmentCase>
-			<changeAlignmentCase>
-				<fromPriceList>rescue</fromPriceList>
-				<toPriceList>rescue</toPriceList>
-				<alignment>CHANGE_OF_PRICELIST</alignment>
-			</changeAlignmentCase>
-			<changeAlignmentCase>
-				<alignment>START_OF_SUBSCRIPTION</alignment>
-			</changeAlignmentCase>
-		</changeAlignment>
-		<cancelPolicy>
-			<cancelPolicyCase>
-				<phaseType>TRIAL</phaseType>
-				<policy>IMMEDIATE</policy>
-			</cancelPolicyCase>
-			<cancelPolicyCase>
-				<policy>END_OF_TERM</policy>
-			</cancelPolicyCase>
-		</cancelPolicy>
-		<createAlignment>
-			<createAlignmentCase>
-				<product>Laser-Scope</product>
-				<alignment>START_OF_SUBSCRIPTION</alignment>
-			</createAlignmentCase>
-			<createAlignmentCase>
-				<alignment>START_OF_BUNDLE</alignment>
-			</createAlignmentCase>
-		</createAlignment>
-		<billingAlignment>
-			<billingAlignmentCase>
-				<productCategory>ADD_ON</productCategory>
-				<alignment>BUNDLE</alignment>
-			</billingAlignmentCase>
-			<billingAlignmentCase>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<alignment>SUBSCRIPTION</alignment>
-			</billingAlignmentCase>
-			<billingAlignmentCase>
-				<alignment>ACCOUNT</alignment>
-			</billingAlignmentCase>
-		</billingAlignment>
-		<priceList>
-			<priceListCase>
-				<fromPriceList>rescue</fromPriceList>
-				<toPriceList>DEFAULT</toPriceList>
-			</priceListCase>
-		</priceList>
-	</rules>
+    <rules>
+        <changePolicy>
+            <changePolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <toPriceList>rescue</toPriceList>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <toProduct>Assault-Rifle</toProduct>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <fromProduct>Pistol</fromProduct>
+                <toProduct>Shotgun</toProduct>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <fromBillingPeriod>MONTHLY</fromBillingPeriod>
+                <toBillingPeriod>ANNUAL</toBillingPeriod>
+                <policy>IMMEDIATE</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <fromBillingPeriod>ANNUAL</fromBillingPeriod>
+                <toBillingPeriod>MONTHLY</toBillingPeriod>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+            <changePolicyCase>
+                <policy>END_OF_TERM</policy>
+            </changePolicyCase>
+        </changePolicy>
+        <changeAlignment>
+            <changeAlignmentCase>
+                <toPriceList>rescue</toPriceList>
+                <alignment>CHANGE_OF_PLAN</alignment>
+            </changeAlignmentCase>
+            <changeAlignmentCase>
+                <fromPriceList>rescue</fromPriceList>
+                <toPriceList>rescue</toPriceList>
+                <alignment>CHANGE_OF_PRICELIST</alignment>
+            </changeAlignmentCase>
+            <changeAlignmentCase>
+                <alignment>START_OF_SUBSCRIPTION</alignment>
+            </changeAlignmentCase>
+        </changeAlignment>
+        <cancelPolicy>
+            <cancelPolicyCase>
+                <phaseType>TRIAL</phaseType>
+                <policy>IMMEDIATE</policy>
+            </cancelPolicyCase>
+            <cancelPolicyCase>
+                <policy>END_OF_TERM</policy>
+            </cancelPolicyCase>
+        </cancelPolicy>
+        <createAlignment>
+            <createAlignmentCase>
+                <product>Laser-Scope</product>
+                <alignment>START_OF_SUBSCRIPTION</alignment>
+            </createAlignmentCase>
+            <createAlignmentCase>
+                <alignment>START_OF_BUNDLE</alignment>
+            </createAlignmentCase>
+        </createAlignment>
+        <billingAlignment>
+            <billingAlignmentCase>
+                <productCategory>ADD_ON</productCategory>
+                <alignment>BUNDLE</alignment>
+            </billingAlignmentCase>
+            <billingAlignmentCase>
+                <billingPeriod>ANNUAL</billingPeriod>
+                <alignment>SUBSCRIPTION</alignment>
+            </billingAlignmentCase>
+            <billingAlignmentCase>
+                <alignment>ACCOUNT</alignment>
+            </billingAlignmentCase>
+        </billingAlignment>
+        <priceList>
+            <priceListCase>
+                <fromPriceList>rescue</fromPriceList>
+                <toPriceList>DEFAULT</toPriceList>
+            </priceListCase>
+        </priceList>
+    </rules>
 
-	<plans>
-		<plan name="pistol-monthly">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice> <!-- empty price implies $0 -->
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>GBP</currency>
-						<value>29.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>29.95</value>
-					</price>
-					<price>
-						<currency>USD</currency>
-						<value>29.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-monthly">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice></fixedPrice>
-					<!-- no price implies $0 -->
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-					<number>-1</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>249.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>149.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>169.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-monthly">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>599.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>349.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>399.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="pistol-annual">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>199.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>2399.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>1499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>1699.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-annual">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>5999.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>3499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>3999.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="pistol-annual-gunclub-discount">
-			<product>Pistol</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>6</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price>
-							<currency>USD</currency>
-							<value>9.95</value>
-						</price>
-						<price>
-							<currency>EUR</currency>
-							<value>9.95</value>
-						</price>
-						<price>
-							<currency>GBP</currency>
-							<value>9.95</value>
-						</price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>199.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="shotgun-annual-gunclub-discount">
-			<product>Shotgun</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>6</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price>
-							<currency>USD</currency>
-							<value>19.95</value>
-						</price>
-						<price>
-							<currency>EUR</currency>
-							<value>49.95</value>
-						</price>
-						<price>
-							<currency>GBP</currency>
-							<value>69.95</value>
-						</price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>2399.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>1499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>1699.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-annual-gunclub-discount">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>6</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price>
-							<currency>USD</currency>
-							<value>99.95</value>
-						</price>
-						<price>
-							<currency>EUR</currency>
-							<value>99.95</value>
-						</price>
-						<price>
-							<currency>GBP</currency>
-							<value>99.95</value>
-						</price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>5999.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>3499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>3999.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="laser-scope-monthly">
-			<product>Laser-Scope</product>
-			<initialPhases>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>1</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price>
-							<currency>USD</currency>
-							<value>999.95</value>
-						</price>
-						<price>
-							<currency>EUR</currency>
-							<value>499.95</value>
-						</price>
-						<price>
-							<currency>GBP</currency>
-							<value>999.95</value>
-						</price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>1999.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>1499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>1999.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="telescopic-scope-monthly">
-			<product>Telescopic-Scope</product>
-			<initialPhases>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>1</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-						<price>
-							<currency>USD</currency>
-							<value>399.95</value>
-						</price>
-						<price>
-							<currency>EUR</currency>
-							<value>299.95</value>
-						</price>
-						<price>
-							<currency>GBP</currency>
-							<value>399.95</value>
-						</price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>999.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>999.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="extra-ammo-monthly">
-			<product>Extra-Ammo</product>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>999.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>999.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-			<plansAllowedInBundle>-1</plansAllowedInBundle> <!-- arbitrary number of these (multipack) -->
-		</plan>
-		<plan name="holster-monthly-regular">
-			<product>Holster</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>199.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="holster-monthly-special">
-			<product>Holster</product>
-			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>DAYS</unit>
-						<number>30</number>
-					</duration>
-					<billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-					<fixedPrice>
-					</fixedPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>199.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="assault-rifle-annual-rescue">
-			<product>Assault-Rifle</product>
-			<initialPhases>
-				<phase type="DISCOUNT">
-					<duration>
-						<unit>YEARS</unit>
-						<number>1</number>
-					</duration>
-					<billingPeriod>ANNUAL</billingPeriod>
-					<recurringPrice>
-						<price>
-							<currency>USD</currency>
-							<value>5999.95</value>
-						</price>
-						<price>
-							<currency>EUR</currency>
-							<value>3499.95</value>
-						</price>
-						<price>
-							<currency>GBP</currency>
-							<value>3999.95</value>
-						</price>
-					</recurringPrice>
-				</phase>
-			</initialPhases>
-			<finalPhase type="EVERGREEN">
-				<duration>
-					<unit>UNLIMITED</unit>
-				</duration>
-				<billingPeriod>ANNUAL</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>5999.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>3499.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>3999.95</value>
-					</price>
-				</recurringPrice>
-			</finalPhase>
-		</plan>
-		<plan name="refurbish-maintenance">
-			<product>Refurbish-Maintenance</product>
-			<finalPhase type="FIXEDTERM">
-				<duration>
-					<unit>MONTHS</unit>
-					<number>12</number>
-				</duration>
-				<billingPeriod>MONTHLY</billingPeriod>
-				<recurringPrice>
-					<price>
-						<currency>USD</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>199.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>199.95</value>
-					</price>
-				</recurringPrice>
-				<fixedPrice>
-					<price>
-						<currency>USD</currency>
-						<value>599.95</value>
-					</price>
-					<price>
-						<currency>EUR</currency>
-						<value>599.95</value>
-					</price>
-					<price>
-						<currency>GBP</currency>
-						<value>599.95</value>
-					</price>
-				</fixedPrice>
-			</finalPhase>
-		</plan>
-	</plans>
-	<priceLists>
-		<defaultPriceList name="DEFAULT">
-			<plans>
-				<plan>pistol-monthly</plan>
-				<plan>shotgun-monthly</plan>
-				<plan>assault-rifle-monthly</plan>
-				<plan>pistol-annual</plan>
-				<plan>shotgun-annual</plan>
-				<plan>assault-rifle-annual</plan>
-				<plan>laser-scope-monthly</plan>
-				<plan>telescopic-scope-monthly</plan>
-				<plan>extra-ammo-monthly</plan>
-				<plan>holster-monthly-regular</plan>
-				<plan>refurbish-maintenance</plan>
-			</plans>
-		</defaultPriceList>
-		<childPriceList name="gunclubDiscount">
-			<plans>
-				<plan>pistol-monthly</plan>
-				<plan>shotgun-monthly</plan>
-				<plan>assault-rifle-monthly</plan>
-				<plan>pistol-annual-gunclub-discount</plan>
-				<plan>shotgun-annual-gunclub-discount</plan>
-				<plan>assault-rifle-annual-gunclub-discount</plan>
-				<plan>holster-monthly-special</plan>
-			</plans>
-		</childPriceList>
-		<childPriceList name="rescue">
-			<plans>
-				<plan>assault-rifle-annual-rescue</plan>
-			</plans>
-		</childPriceList>
-	</priceLists>
+    <plans>
+        <plan name="pistol-monthly">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>29.95</value>
+                        </price>
+                        <price>
+                            <currency>USD</currency>
+                            <value>29.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-monthly">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                    <number>-1</number>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>249.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>149.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>169.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-monthly">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>349.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>399.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="pistol-annual">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-annual">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>5999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>3499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>3999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="pistol-annual-gunclub-discount">
+            <product>Pistol</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>6</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>9.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>9.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>9.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="shotgun-annual-gunclub-discount">
+            <product>Shotgun</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>6</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>19.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>49.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>69.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>2399.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1699.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-annual-gunclub-discount">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>6</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>99.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>99.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>99.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>5999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>3499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>3999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="laser-scope-monthly">
+            <product>Laser-Scope</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>999.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>499.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>999.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>1999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>1499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>1999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="telescopic-scope-monthly">
+            <product>Telescopic-Scope</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>MONTHS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>399.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>299.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>399.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="extra-ammo-monthly">
+            <product>Extra-Ammo</product>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+            <plansAllowedInBundle>-1</plansAllowedInBundle>
+            <!-- arbitrary number of these (multipack) -->
+        </plan>
+        <plan name="holster-monthly-regular">
+            <product>Holster</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="holster-monthly-special">
+            <product>Holster</product>
+            <initialPhases>
+                <phase type="TRIAL">
+                    <duration>
+                        <unit>DAYS</unit>
+                        <number>30</number>
+                    </duration>
+                    <fixed>
+                        <fixedPrice> <!-- empty price implies $0 -->
+                        </fixedPrice>
+                    </fixed>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="assault-rifle-annual-rescue">
+            <product>Assault-Rifle</product>
+            <initialPhases>
+                <phase type="DISCOUNT">
+                    <duration>
+                        <unit>YEARS</unit>
+                        <number>1</number>
+                    </duration>
+                    <recurring>
+                        <billingPeriod>ANNUAL</billingPeriod>
+                        <recurringPrice>
+                            <price>
+                                <currency>USD</currency>
+                                <value>5999.95</value>
+                            </price>
+                            <price>
+                                <currency>EUR</currency>
+                                <value>3499.95</value>
+                            </price>
+                            <price>
+                                <currency>GBP</currency>
+                                <value>3999.95</value>
+                            </price>
+                        </recurringPrice>
+                    </recurring>
+                </phase>
+            </initialPhases>
+            <finalPhase type="EVERGREEN">
+                <duration>
+                    <unit>UNLIMITED</unit>
+                </duration>
+                <recurring>
+                    <billingPeriod>ANNUAL</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>5999.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>3499.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>3999.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+        <plan name="refurbish-maintenance">
+            <product>Refurbish-Maintenance</product>
+            <finalPhase type="FIXEDTERM">
+                <duration>
+                    <unit>MONTHS</unit>
+                    <number>12</number>
+                </duration>
+                <fixed>
+                    <fixedPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>599.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>599.95</value>
+                        </price>
+                    </fixedPrice>
+                </fixed>
+                <recurring>
+                    <billingPeriod>MONTHLY</billingPeriod>
+                    <recurringPrice>
+                        <price>
+                            <currency>USD</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>EUR</currency>
+                            <value>199.95</value>
+                        </price>
+                        <price>
+                            <currency>GBP</currency>
+                            <value>199.95</value>
+                        </price>
+                    </recurringPrice>
+                </recurring>
+            </finalPhase>
+        </plan>
+    </plans>
+    <priceLists>
+        <defaultPriceList name="DEFAULT">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>assault-rifle-monthly</plan>
+                <plan>pistol-annual</plan>
+                <plan>shotgun-annual</plan>
+                <plan>assault-rifle-annual</plan>
+                <plan>laser-scope-monthly</plan>
+                <plan>telescopic-scope-monthly</plan>
+                <plan>extra-ammo-monthly</plan>
+                <plan>holster-monthly-regular</plan>
+                <plan>refurbish-maintenance</plan>
+            </plans>
+        </defaultPriceList>
+        <childPriceList name="gunclubDiscount">
+            <plans>
+                <plan>pistol-monthly</plan>
+                <plan>shotgun-monthly</plan>
+                <plan>assault-rifle-monthly</plan>
+                <plan>pistol-annual-gunclub-discount</plan>
+                <plan>shotgun-annual-gunclub-discount</plan>
+                <plan>assault-rifle-annual-gunclub-discount</plan>
+                <plan>holster-monthly-special</plan>
+            </plans>
+        </childPriceList>
+        <childPriceList name="rescue">
+            <plans>
+                <plan>assault-rifle-annual-rescue</plan>
+            </plans>
+        </childPriceList>
+    </priceLists>
 
 </catalog>

diff --git a/util/src/test/java/org/killbill/billing/mock/MockPlan.java b/util/src/test/java/org/killbill/billing/mock/MockPlan.java
index 2317781..a5e03ec 100644
--- a/util/src/test/java/org/killbill/billing/mock/MockPlan.java
+++ b/util/src/test/java/org/killbill/billing/mock/MockPlan.java
@@ -73,7 +73,7 @@ public class MockPlan implements Plan {
     }
 
     @Override
-    public BillingPeriod getBillingPeriod() {
+    public BillingPeriod getRecurringBillingPeriod() {
         throw new UnsupportedOperationException();
     }