From 705b514c78eb595471f7715ad27b997e6bd8323d Mon Sep 17 00:00:00 2001
From: P J P <pjp@fedoraproject.org>
Date: Apr 28 2018 08:59:08 +0000
Subject: [PATCH 1/2] Sync with the upstream fedora-budget repository


---

diff --git a/FY15/README.adoc b/FY15/README.adoc
index 6e8ea4a..2d37f26 100644
--- a/FY15/README.adoc
+++ b/FY15/README.adoc
@@ -1,3 +1,6 @@
 = FY15 Archive Data
 
 Fiscal Year 2015 is from before the new ledger system was implemented.  There are archive files from that year available in the link:https://pagure.io/fedora-budget/blob/master/f/FY15[FY 15 Folder] of the link:https://pagure.io/fedora-budget/[Budget Pagure Repository].
+
+
+Built on: {localdatetime}
diff --git a/FY16/README.adoc b/FY16/README.adoc
index cb223d9..6ea0d4e 100644
--- a/FY16/README.adoc
+++ b/FY16/README.adoc
@@ -1,3 +1,6 @@
 = FY16 Archive Data
 
 Fiscal Year 2016 is from before the new ledger system was implemented.  There are archive files from that year available in the link:https://pagure.io/fedora-budget/blob/master/f/FY16[FY 16 Folder] of the link:https://pagure.io/fedora-budget/[Budget Pagure Repository].
+
+
+Built on: {localdatetime}
diff --git a/FY17/README.adoc b/FY17/README.adoc
index 446d979..8fc2bcd 100644
--- a/FY17/README.adoc
+++ b/FY17/README.adoc
@@ -41,3 +41,6 @@ During FY17, the following people worked on the budget team.
 - Card Holder: mailto:{na_cc_email}[{na_cc_name}]
 - Additional Card Holder: mailto:inode0 <inode0@gmail.com[John Rose]
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/apac.adoc b/FY17/apac.adoc
index 95077d9..9f2b623 100644
--- a/FY17/apac.adoc
+++ b/FY17/apac.adoc
@@ -7,7 +7,10 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/apac.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/d-i.adoc b/FY17/d-i.adoc
index 21a3de4..7aafa07 100644
--- a/FY17/d-i.adoc
+++ b/FY17/d-i.adoc
@@ -7,7 +7,10 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/d-i.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/emea.adoc b/FY17/emea.adoc
index ee3d1c4..d622399 100644
--- a/FY17/emea.adoc
+++ b/FY17/emea.adoc
@@ -7,7 +7,7 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/emea.csv[]
 |===
 
@@ -17,7 +17,7 @@ Q1 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/emea-q1.csv[]
 |===
 
@@ -27,7 +27,7 @@ Q2 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/emea-q2.csv[]
 |===
 
@@ -37,7 +37,7 @@ Q3 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/emea-q3.csv[]
 |===
 
@@ -47,7 +47,10 @@ Q4 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/emea-q4.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/events.adoc b/FY17/events.adoc
index 1185c40..fcf54b2 100644
--- a/FY17/events.adoc
+++ b/FY17/events.adoc
@@ -7,7 +7,7 @@ Flock Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/flock.csv[]
 |===
 
@@ -17,7 +17,7 @@ FUDCon APAC Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/fudcon-apac.csv[]
 |===
 
@@ -27,6 +27,9 @@ FUDCon LATAM Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/fudcon-latam.csv[]
 |===
+
+
+Built on: {localdatetime}
diff --git a/FY17/fads.adoc b/FY17/fads.adoc
index f4b3d34..98cb77e 100644
--- a/FY17/fads.adoc
+++ b/FY17/fads.adoc
@@ -7,7 +7,7 @@ FADs Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/fads.csv[]
 |===
 
@@ -17,7 +17,10 @@ Diversity FAD Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/fads-diversity.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/latam.adoc b/FY17/latam.adoc
index 2aacf24..df62219 100644
--- a/FY17/latam.adoc
+++ b/FY17/latam.adoc
@@ -7,7 +7,10 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/latam.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/na.adoc b/FY17/na.adoc
index fe79a91..78c6b12 100644
--- a/FY17/na.adoc
+++ b/FY17/na.adoc
@@ -7,7 +7,10 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/na.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/overall.adoc b/FY17/overall.adoc
index 31de651..88ac477 100644
--- a/FY17/overall.adoc
+++ b/FY17/overall.adoc
@@ -7,7 +7,10 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Spent So Far	Budget	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY17/overall.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY17/people.adoc b/FY17/people.adoc
index 511ff1c..3dee7b7 100644
--- a/FY17/people.adoc
+++ b/FY17/people.adoc
@@ -44,3 +44,6 @@
 // Other
 :FCAIC_name: Brian Exelbierd
 :FCAIC_email: bex@pobox.com
+
+
+Built on: {localdatetime}
diff --git a/FY18/README.adoc b/FY18/README.adoc
index fd98fe4..506320d 100644
--- a/FY18/README.adoc
+++ b/FY18/README.adoc
@@ -41,3 +41,6 @@ During FY18, the following people are working on the budget team.
 - Card Holder: mailto:{na_cc_email}[{na_cc_name}]
 - Additional Card Holder: mailto:inode0@gmail.com[John Rose]
 
+
+
+Built on: {localdatetime}
diff --git a/FY18/apac.adoc b/FY18/apac.adoc
index ff92be5..71f5949 100644
--- a/FY18/apac.adoc
+++ b/FY18/apac.adoc
@@ -7,7 +7,7 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/apac.csv[]
 |===
 
@@ -18,7 +18,7 @@ Q1 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/apac-q1.csv[]
 |===
 
@@ -28,7 +28,7 @@ Q2 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/apac-q2.csv[]
 |===
 
@@ -38,7 +38,7 @@ Q3 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/apac-q3.csv[]
 |===
 
@@ -48,7 +48,10 @@ Q4 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/apac-q4.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY18/council.adoc b/FY18/council.adoc
index 3a2d8d4..3787299 100644
--- a/FY18/council.adoc
+++ b/FY18/council.adoc
@@ -7,6 +7,9 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/council.csv[]
 |===
+
+
+Built on: {localdatetime}
diff --git a/FY18/d-i.adoc b/FY18/d-i.adoc
index f23ce3e..1bf6d8b 100644
--- a/FY18/d-i.adoc
+++ b/FY18/d-i.adoc
@@ -7,7 +7,10 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/d-i.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY18/emea.adoc b/FY18/emea.adoc
index fd948ab..a6ae48b 100644
--- a/FY18/emea.adoc
+++ b/FY18/emea.adoc
@@ -7,7 +7,7 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/emea.csv[]
 |===
 
@@ -17,7 +17,7 @@ Q1 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/emea-q1.csv[]
 |===
 
@@ -27,7 +27,7 @@ Q2 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/emea-q2.csv[]
 |===
 
@@ -37,7 +37,7 @@ Q3 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/emea-q3.csv[]
 |===
 
@@ -47,7 +47,10 @@ Q4 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/emea-q4.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY18/events.adoc b/FY18/events.adoc
index 397b65d..7dbde36 100644
--- a/FY18/events.adoc
+++ b/FY18/events.adoc
@@ -7,6 +7,9 @@ Flock Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/flock.csv[]
 |===
+
+
+Built on: {localdatetime}
diff --git a/FY18/fads.adoc b/FY18/fads.adoc
index 3da96f9..176b4ce 100644
--- a/FY18/fads.adoc
+++ b/FY18/fads.adoc
@@ -7,6 +7,9 @@ FADs Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/fads.csv[]
 |===
+
+
+Built on: {localdatetime}
diff --git a/FY18/gen_reports b/FY18/gen_reports
index 91a4f2d..048f662 100755
--- a/FY18/gen_reports
+++ b/FY18/gen_reports
@@ -4,11 +4,14 @@
 rm *.csv
 
 # Overall Report for Fedora
-ledger -f ledger/fedora.ledger budget --depth 1 not '^Annual Budget$' and not '^External$' | ../_builder/budget2tsv > overall.csv
+ledger -f ledger/fedora.ledger budget --depth 1 not '^Budget'| ../_builder/budget2tsv > overall.csv
 if [ ! -s overall.csv ]; then
     ledger -f ledger/fedora.ledger budget --depth 1 | ../_builder/budget2tsv > overall.csv
 fi
 
+# Source of funds
+ledger -f ledger/fedora.ledger budget '^Budget' --flat | ../_builder/budget2tsv | cut -f1-2 > source.csv
+
 # Flock - doesn't do second levels so we need to just do the first level list and cut the first line
 ledger -f ledger/fedora.ledger budget '^Flock' --flat | tail -n +2 | ../_builder/budget2tsv > flock.csv
 
@@ -26,6 +29,9 @@ ledger -f ledger/fedora.ledger budget '^Diversity-Inclusion' --flat | tail -n +1
 
 # Mindshare - doesn't do second levels so we need to just do the first level list and cut the first line
 ledger -f ledger/fedora.ledger budget '^Mindshare' --flat | tail -n +2 | ../_builder/budget2tsv > mindshare.csv
+if [ ! -s mindshare.csv ]; then
+    ledger -f ledger/fedora.ledger budget '^Mindshare' --flat | ../_builder/budget2tsv > mindshare.csv
+fi
 
 # Council and Other Expenses
 ledger -f ledger/fedora.ledger budget '^Council' and not '^Council$' --flat | ../_builder/budget2tsv > council.csv
diff --git a/FY18/latam.adoc b/FY18/latam.adoc
index 40358f0..b6a99fe 100644
--- a/FY18/latam.adoc
+++ b/FY18/latam.adoc
@@ -7,7 +7,7 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/latam.csv[]
 |===
 
@@ -18,7 +18,7 @@ Q1 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/latam-q1.csv[]
 |===
 
@@ -28,7 +28,7 @@ Q2 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/latam-q2.csv[]
 |===
 
@@ -38,7 +38,7 @@ Q3 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/latam-q3.csv[]
 |===
 
@@ -48,7 +48,10 @@ Q4 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/latam-q4.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY18/ledger/apac.ldg b/FY18/ledger/apac.ldg
index 1a5a150..2e58ee0 100644
--- a/FY18/ledger/apac.ldg
+++ b/FY18/ledger/apac.ldg
@@ -1,11 +1,12 @@
 ~ every 2 years
     ; Budget
     APAC:Unallocated      $5600
-    APAC:FY17 Expenses   -$485.21
+    APAC:FY17 Expenses   -$582.69
     APAC:Q1              -$0
     APAC:Q2              -$1000
+    APAC:Q2               $411.20 ; quarter end sweep
     APAC:Q3              -$0
-    APAC:Q4              -$0
+    APAC:Q4              -$1000
     APAC:Unallocated
 
 ~ every 2 years
@@ -15,29 +16,67 @@
     APAC:Q2:Swag         -$510  ; https://pagure.io/ambassadors-apac/issue/268
     APAC:Q2:F26 RP       -$100  ; https://pagure.io/ambassadors-apac/issue/269
     APAC:Q2:F26 RP       -$100  ; https://pagure.io/ambassadors-apac/issue/272
-    APAC:Q4:DFD          -$128.75; https://pagure.io/ambassadors-apac/issue/223
-    APAC:Q4:Swag CN      -$101.07; https://pagure.io/ambassadors-apac/issue/277
-    APAC:Q4:F27 RP       -$55.55 ; https://pagure.io/ambassadors-apac/issue/279
-    APAC:Q4:F27 RP       -$30.00 ; https://pagure.io/ambassadors-apac/issue/280
-    APAC:Q4:F27 RP       -$100.00; https://pagure.io/ambassadors-apac/issue/281
-    APAC:Q4:Trans-sprint -$93.95 ; https://pagure.io/ambassadors-apac/issue/284
+    APAC:Q2
+
+~ every 2 years
+    ; Budget
+    APAC:Q4                 $1000
+    APAC:Q4:DFD            -$128.75; https://pagure.io/ambassadors-apac/issue/223
+    APAC:Q4:Swag CN        -$101.07; https://pagure.io/ambassadors-apac/issue/277
+    APAC:Q4:F27 RP         -$55.55 ; https://pagure.io/ambassadors-apac/issue/279
+    APAC:Q4:F27 RP         -$30.00 ; https://pagure.io/ambassadors-apac/issue/280
+    APAC:Q4:F27 RP         -$100.00; https://pagure.io/ambassadors-apac/issue/281
+    APAC:Q4:Trans-sprint   -$120.00 ; https://pagure.io/ambassadors-apac/issue/284
+    APAC:Q4
 
 2017-05-31 * Funding Request for Tenzin Chokden Nullcon 2017
     ; Ticket: https://fedorahosted.org/fedora-apac/ticket/264
-    ; Payment: CC jsimon:May17
-    Expense:Transportation                $485.21 ; 31369 INR
+    ; Payment: EMEA CC - June
+    Expense:ransportation                $485.21 ; 31369 INR
     APAC:FY17 Expenses              -$485.21
 
 2017-08-08 * Prasad J Pandit - DVD Printing
-    ; Payment: bex CC - IE2563459
+    ; Payment: IE2563459
     ; Ticket: https://pagure.io/ambassadors-apac/issue/268
     Expense:Trade Show               $499.19 ; 31860 INR -> 423.53
     Expense:Trade Show:Paypal Fee    $5.56 ; 4.72 EUR Transferwise
     APAC:Q2:Swag                    -$504.75
 
-2017-08-14   zsun - community cards
-    ; Payment: bex Meeting Card
+2017-08-14 * zsun - community cards
+    ; Payment: bex Meeting Card - August 2017
     ; Ticket: https://pagure.io/ambassadors-apac/issue/267
     Expense:Trade Show               $3.37 ; 22.5 CNY
     Expense:Trade Show:Paypal Fee    $0.43
     APAC:Q2:Swag                    -$3.80
+
+2017-09-19 * Sumantro - F26 Release Party BLR
+    ; Payment: IE2598226
+    ; Ticket: https://pagure.io/ambassadors-apac/issue/269
+    Expense:Meals         $80.25
+    APAC:Q2:F26 RP       -$80.25
+
+2018-02-07 * Document Freedom Day
+    ; Ticket: https://pagure.io/ambassadors-apac/issue/223
+    ; Payment: IE2751874 - bex CC February
+    Expense:Meals                $97.48 ; 128.75 SGD
+    APAC:FY17 Expenses          -$97.48
+
+2018-02-12 * Translation Sprint
+    ; Ticket: https://pagure.io/ambassadors-apac/issue/284
+    ; Payment: IE2751874 - bex CC February
+    Expense:Meals                $93.95
+    Expense:Meals:Paypal         $3.66
+    APAC:Q4:Trans-sprint        -$97.61
+
+2018-02-12 * Fedora RP Taiwan
+    ; Ticket https://pagure.io/ambassadors-apac/issue/280
+    ; Payment: IE2751874 - bex CC February
+    Expense:Meals                $31.45 ; 878 TWD + Paypal fees = 922 TWD
+    APAC:Q4:F27 RP              -$31.45
+
+2018-02-12 * Fedora RP Taiwan
+    ; Ticket https://pagure.io/ambassadors-apac/issue/279
+    ; Payment: IE2751874 - bex CC February
+    Expense:Meals                $57.64 ; 3570 INR + Transferwise fees
+    APAC:Q4:F27 RP              -$57.64
+
diff --git a/FY18/ledger/council.ldg b/FY18/ledger/council.ldg
index 67433f5..978de95 100644
--- a/FY18/ledger/council.ldg
+++ b/FY18/ledger/council.ldg
@@ -5,15 +5,16 @@
    ; 2017/04/10   Initial Quarter 1 budget (with some annual)
    ; Replaces Temporary Budget Allocation below
    ; https://lists.fedoraproject.org/archives/list/council-discuss@lists.fedoraproject.org/thread/HQPSNVKBI3LTUVH6SVJZ7BMUVOPQJLCZ/
+   Budget:Red Hat           $196000 ; budget for FY18
    APAC:Unallocated        -$1600
    EMEA:Unallocated        -$4100
    LATAM:Unallocated       -$1300
    NA:Unallocated          -$4250
    Flock                   -$85000
+   Flock                    $12,558.81 ; underspend sweep
    Mindshare:Unallocated               -$9000
    Diversity-Inclusion:Unallocated     -$9000
-   Council:Unallocated     -$81750
-   Annual Budget            $196000
+   Council:Unallocated
 
 ~ every 2 years
    ; 2017/08/03   FY18 Budgets
@@ -22,13 +23,22 @@
    EMEA:Unallocated        -$7000
    LATAM:Unallocated       -$3000
    NA:Unallocated          -$9000
-   Council:Unallocated      $23000
+   Council:Other            $166.80 ; underspend sweep
+   Council:Unallocated
+
+2017-03-01 * RH Funded
+    Budget:Red Hat         $196000
+    External:Red Hat      -$196000
 
 2017-03-09 * Refund from stamps.com of unspent balance - account closed on 9 Dec 2016
    ; This was originally sent to nb by paper check - He transferred it to bexelbie by paypal
    ; Moved through to Annual Budget
-   Expense:Postage      -$85.17
-   Council:Unallocated   $85.17
+   External:Refund      -$85.17
+   Budget:Other          $85.17
+
+~ every 2 years
+   Budget:Other          $85.17
+   Council:Unallocated
 
 ~ every 2 years
    ; 2017/03/01   Council FAD
@@ -43,30 +53,124 @@
 
 ~ every 2 years
    ; 2017/04/07   Infrastructure Hackfest
-   ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/94
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/94
    FADs:Unallocated        -$9700
    Council:Unallocated      $9700
 
 ~ every 2 years
    ; 2017/07/10   Infrastructure Hackfest
-   ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/124
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/124
    FADs:Unallocated         $2433.48
    Council:Unallocated     -$2433.48
 
 ~ every 2 years
    ; 2017/06/20   LATAM FAD
-   ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/116
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/116
    FADs:Unallocated        -$5000
    Council:Unallocated      $5000
 
 ~ every 2 years
    ; 2017/07/10   LATAM FAD
-   ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/124
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/124
    FADs:Unallocated        -$1000
    Council:Unallocated      $1000
 
 ~ every 2 years
    ; 2017/06/28   Translation Sprint T-shirts
-   ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/69
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/69
    Council:Other:Translation Sprint T-shirts        -$750
    Council:Unallocated                               $750
+
+~ every 2 years
+   ; 2017/09/20   G11N FAD
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/136
+   FADs:Unallocated        -$8000 ; $1200 is for airfare overruns
+   Council:Unallocated      $8000
+
+2017-10-18 * Translation T-shirt printing
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/69
+   ; Payment: Invoice - October - T-Shirts
+   Expense:Trade Show                               $478.44 ; 10496 CZK 
+   Council:Other:Translation Sprint T-shirts       -$478.44
+
+~ every 2 years
+   ; 2017/12/13   CommOps FAD
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/159
+   FADs:Unallocated        -$2635 ; $600 of existing FAD underspend is being used to total is 3235
+   Council:Unallocated      $2635
+
+2017-12-08 * Translation Thank you card printing
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/69
+   ; Payment: Invoice - November
+   Expense:Printing/Reproduction                    $29.59 ; 644.55 CZK 
+   Council:Other:Translation Sprint T-shirts       -$29.59
+
+~ every 2 years
+   ; 2017/12/20   EMEA Allocation Increase
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/163
+   EMEA:Unallocated        -$5000
+   Council:Unallocated      $5000
+
+2018-01-11 * Translation Envelopes for shipping
+   ; Payment: IE2689100 - bex Cash
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/69
+   Expense:Printing/Reproduction                    $16.27 ; 345 CZK
+   Council:Other:Translation Sprint T-shirts       -$16.27
+
+~ every 2 years
+   ; 2018/01/17   Fedora Loves .NET swag
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/171
+   Council:Other:Fedora Loves .NET                  -$583
+   Council:Unallocated                               $583
+
+~ every 2 years
+   ; 2018/01/17   Docs FAD
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/174
+   FADs:Unallocated        -$10385
+   Council:Unallocated      $10385
+
+~ every 2 years
+   ; 2018/01/17   LATAM Allocation Increase
+   ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/175
+   LATAM:Unallocated        -$10000
+   Council:Unallocated      $10000
+
+~ every 2 years
+    ; 2018/02/08   Microphone
+    ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/179
+   Council:Other:Microphone    -$100
+   Council:Unallocated          $100
+
+2018-02-08 * Microphone for podcasts
+    ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/179
+    ; Payment: bex PCARD
+    Expense:Other Marketing Costs    $99.06
+    Council:Other:Microphone        -$99.06
+
+2018-02-14 * .NET materials
+    ; Payment: IE2736503 - Radka Janekova
+    Expense:Trade Show               $642.84 ; 13,199.47 CZK
+    Council:Other:Fedora Loves .NET   -$642.84
+
+~ every 2 years
+    ; 2018/02/08   Microphone
+    ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/179
+   Council:Other:GrimoireCon   -$126.80
+   Council:Unallocated          $126.80
+
+2018-02-14 * Grimoire Con separate expenses
+    ; Payment: IE2736424 - Radka Janekova
+    Expense:Meals                                $99.54 ; 80.50 EUR
+    Expense:Transportation                       $27.26
+    Council:Other:GrimoireCon                   -$126.80
+
+~ every 2 years
+    ; 2018/02/15   Additional funds for Outreachy
+    ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/184
+   Diversity-Inclusion:Unallocated     -$6500
+   Council:Unallocated                  $6500
+
+~ every 2 years
+    ; Sweep in underspend from Summer Coding
+    Summer Coding:Unallocated           $2,445.70
+    Council:Unallocated
diff --git a/FY18/ledger/diversity.ldg b/FY18/ledger/diversity.ldg
index 9b4f4ee..3acaa44 100644
--- a/FY18/ledger/diversity.ldg
+++ b/FY18/ledger/diversity.ldg
@@ -1,13 +1,101 @@
 ~ every 2 years
     ; Budget
-    Diversity-Inclusion:Unallocated              $9000
-    Diversity-Inclusion:FWD:Bangalore           -$155
-    Diversity-Inclusion:FWD:Pune                -$90
-    Diversity-Inclusion:FWD:Aurangabad          -$55
+    Diversity-Inclusion:Unallocated             $9000
+    Diversity-Inclusion:Unallocated             $6500 ; second outreachy
+    Diversity-Inclusion:FWD:Aurangabad         -$55
+    Diversity-Inclusion:FWD:Bangalore          -$155
+    Diversity-Inclusion:FWD:Pune               -$90
+    Diversity-Inclusion:FWD:Tirana             -$60
+    Diversity-Inclusion:FWD:Prishtina          -$77.70
+    Diversity-Inclusion:FWD:Managua            -$97
+    Diversity-Inclusion:FWD:Brno               -$100
+    Diversity-Inclusion:FWD:Lima               -$79
+    Diversity-Inclusion:FWD:Stickers           -$600
+    Diversity-Inclusion:Outreachy              -$13000
+    Diversity-Inclusion:RGSoC                  -$1000
     Diversity-Inclusion:Unallocated
 
 2017-08-16 * Airfare for Amita Sharma
-    ; Payment: Direct
+    ; Payment: Invoice - August - Indian Airfare
     ; Ticket: https://pagure.io/fedora-diversity/issue/34
     Expense:Transportation                      $61.86 ; 3967 INR
     Diversity-Inclusion:FWD:Bangalore          -$61.86
+
+2017-09-13 * Sticker Mule
+    ; Payment: IE2598226
+    Expense:Trade Show                          $201 ; FWD Stickers
+    Diversity-Inclusion:FWD:Stickers           -$201 ; India
+
+2017-09-13 * Sticker Mule
+    ; Payment: IE2598226
+    Expense:Trade Show                          $109 ; FWD Stickers
+    Diversity-Inclusion:FWD:Stickers           -$109 ; Albania
+
+2017-09-13 * Sticker Mule
+    ; Payment: IE2598226
+    Expense:Trade Show                          $109 ; FWD Stickers
+    Diversity-Inclusion:FWD:Stickers           -$109 ; Lima, Peru
+
+2017-09-13 * Sticker Mule
+    ; Payment: IE2598226
+    Expense:Trade Show                          $106.98 ; FWD Stickers
+    Diversity-Inclusion:FWD:Stickers           -$106.98 ; Brno
+
+2017-09-14 * Sticker Mule
+    ; Payment: IE2598226
+    Expense:Trade Show                          $109 ; FWD Stickers
+    Diversity-Inclusion:FWD:Stickers           -$109 ; Cusco, Peru
+
+2017-09-14 * Sticker Mule
+    ; Payment: IE2598226
+    Expense:Trade Show                          $80 ; FWD Stickers
+    Diversity-Inclusion:FWD:Stickers           -$80 ; Nicaragua
+
+2017-09-26 * Amita Sharma FWD - India
+    ; Payment: IE2610191
+    Expense:Transportation                      $32.53
+    Diversity-Inclusion:FWD:Bangalore          -$32.53
+
+2017-10-18 * Fedora Women's Day Brno
+    ; Payment: Invoice - October - Brno Food
+    Expense:Meals                                $99.65 ; 2186.09 CZK
+    Diversity-Inclusion:FWD:Brno                -$99.65
+
+2017-10-18 * Fedora Women's Day Lima
+    ; Payment: IE2588807
+    Expense:Meals                                $51.21  ; 166.3 PEN
+    Expense:Trade Show                           $21.56  ; 70 PEN
+    Diversity-Inclusion:FWD:Lima               -$72.77 ; 236.3 PEN
+
+2017-10-18 * Fedora Women's Day Managua
+    ; Payment: IE2651447
+    Expense:Meals                                $55.49
+    Diversity-Inclusion:FWD:Managua             -$55.49
+
+2018-01-23 * Fedora Women's Day Pune
+    ; Payment: IE2728294 - bex CC
+    Expense:Meals                                $19.99
+    Diversity-Inclusion:FWD:Pune                -$19.99
+
+2018-01-23 * Fedora Women's Day Albania
+    ; Payment: IE2728294 - bex CC
+    Expense:Meals                                $62.44 ; 51.04 EUR
+    Diversity-Inclusion:FWD:Tirana              -$62.44
+    Expense:Transportation                       $18.35 ; 15 EUR
+    Diversity-Inclusion:FWD:Prishtina           -$18.35
+
+2018-01-24 * Software Conservancy - Outreachy
+    ; Payment: Invoice - PO 1010070451
+    Expense:Contributions/Donations     $6500
+    Diversity-Inclusion:Outreachy       -$6500
+
+2018-02-12 * Software Conservancy - Outreachy
+    ; Payment: Invoice - PO 1010070717 - Spring 2018
+    Expense:Contributions/Donations     $6500
+    Diversity-Inclusion:Outreachy       -$6500
+
+2018-02-16 * Rails Girls Summer of Code Sponsorship
+    ; Payment: IE2751874 - bex CC February
+    ; Ticket: https://pagure.io/fedora-diversity/issue/50
+    Expense:Trade Show                  $1000
+    Diversity-Inclusion:RGSoC          -$1000
diff --git a/FY18/ledger/emea.ldg b/FY18/ledger/emea.ldg
index c18de3e..7ba50d3 100644
--- a/FY18/ledger/emea.ldg
+++ b/FY18/ledger/emea.ldg
@@ -1,10 +1,14 @@
 ~ every 2 years
     ; Budget
     EMEA:Unallocated                             $11100
+    EMEA:Unallocated                             $5000 ; increase from https://pagure.io/Fedora-Council/tickets/issue/163
     EMEA:Q1                                     -$3316
-    EMEA:Q2                                     -$2075
-    EMEA:Q3                                     -$0
-    EMEA:Q4                                     -$0
+    EMEA:Q1                                      $101.42 ; quarter end sweep
+    EMEA:Q2                                     -$2125
+    EMEA:Q2                                     -$118.96 ; overrage
+    EMEA:Q3                                     -$330
+    EMEA:Q3                                     -$213.35 ; overrage
+    EMEA:Q4                                     -$10065
     EMEA:Unallocated
 
 ~ every 2 years
@@ -19,20 +23,36 @@
     EMEA:Q1:DORS/CLUC 2017                      -$315
     EMEA:Q1:Swag Production                     -$278
     EMEA:Q1:Pending Tickets From FY17           -$291
-    EMEA:Q1                                      $101.42 ; quarter end sweep
     EMEA:Unallocated
 
 ~ every 2 years
     ; Budget
-    EMEA:Q2                                      $2075
+    EMEA:Q2                                      $2125
     EMEA:Q2:F26 Parties                         -$285
     EMEA:Q2:FrOSCon 2017                        -$680
     EMEA:Q2:Swag Production                     -$430
-    EMEA:Q2:Fedorators                          -$680
+    EMEA:Q2:Fedorators                          -$730
+
+~ every 2 years
+    ; Budget
+    EMEA:Q3                                      $330
+    EMEA:Q3:FOSSCOMM 2017                       -$220
+    EMEA:Q3:F27 Parties                         -$110
+
+~ every 2 years
+    ; Budget
+    EMEA:Q4                                      $10065
+    EMEA:Q4:34C3                                -$750
+    EMEA:Q4:FOSDEM 2018                         -$5200
+    EMEA:Q4:DevConf                             -$775
+    EMEA:Q4:nullcon 2018                        -$1450
+    EMEA:Q4:CLT 2018                            -$390
+    EMEA:Q4:Swag Production                     -$1500
+
 
 2017-03-23 * Jona Airfare for Free Software Activity Day Milan
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/4
-    ; Payment: bex CC - IE2241981
+    ; Payment: IE2241981
     Expense:Transportation                 $173.38 ; 160.77 EUR
     EMEA:Q1:FSAD-Milan 2017               -$173.38
 
@@ -44,129 +64,354 @@
 
 2017-05-19 * EMEA SWAG Fedora Badges
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/15
-    ; Payment: Direct PO
+    ; Payment: Invoice - May - Swag
     Expense:Trade Show        $256.53 ; 6082.64 CZK bez DPH
     EMEA:Q1:Swag Production  -$256.53
 
 2017-05-23 * Michal Cyprian Accomodation for PyCon_SK_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/1
-    ; Payment: CC jsimon:May17
+    ; Payment: EMEA CC - May
     Expense:Lodging          $426.57
     EMEA:Q1:PyCon SK 2017   -$426.57
 
 2017-05-23 * Miro Hrončok Fuel for Chemnitzer_Linuxtage_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/2
-    ; Payment: CC jsimon:May17
+    ; Payment: EMEA CC - May
     Expense:Transportation        $39.72
     EMEA:Q1:CLT 2017        -$39.72
 
 2017-05-23 * Justin W. Flory Transport and Accomodation for Linux_Weekend17_in_Tirana,_Albania
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/3
-    ; Payment: CC jsimon:May17
+    ; Payment: EMEA CC - May
     Expense:Transportation                    $138.66
     EMEA:Q1:Linux Weekend Tirana 2017   -$138.66
 
 2017-05-23 * František Zatloukal Transport to OSCAL_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/4
-    ; Payment: CC jsimon:May17
+    ; Payment: EMEA CC - May
     Expense:Transportation        $250.74
     EMEA:Q1:OSCAL 2017      -$250.74
 
 2017-05-23 * Fabian Affolter Accomodation Transport for Chemnitzer_Linuxtage_2017
     ; Ticket: https://pagure.io/ambassadors-emea/trac_obsolete/issue/654
-    ; Payment: CC jsimon:May17
+    ; Payment: EMEA CC - May
     Expense:Lodging          $303.12
     EMEA:Q1:CLT 2017        -$303.12
 
 2017-05-23 * Giannis Konstantinidis Accomodation for Fedora_vLocalization_Sprint
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/11
-    ; Payment: CC jsimon:May17
+    ; Payment: EMEA CC - May
     Expense:Lodging          $50.32
     EMEA:Q1:OSCAL 2017      -$50.32
 
 2017-05-23 * Christoph Wickert Transport and Accomodation for DevConf 2017 DevConf 2017
     ; Ticket: https://pagure.io/ambassadors-emea/trac_obsolete/issue/647
-    ; Payment: CC jsimon:May17
+    ; Payment: EMEA CC - May
     Expense:Transportation                    $290.53
     EMEA:Q1:Pending Tickets From FY17   -$290.53
 
 2017-05-26 * Jona Azizaj Customs fee for SWAG at OSCAL_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/18
-    ; Payment: CC jsimon
+    ; Payment: EMEA CC - June
     Expense:Customs          $48.89
     EMEA:Q1:OSCAL 2017      -$48.89
 
 2017-05-26 * Zacharias Mitzelos Travel & Accomodation to OSCAL_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/9
-    ; Payment: CC jsimon
+    ; Payment: EMEA CC - June
     Expense:Transportation        $438.80
     EMEA:Q1:OSCAL 2017      -$438.80
 
 2017-06-01 * EMEA SWAG Fedora Badges - Serigrafika
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/15
-    ; Payment: Direct PO
+    ; Payment: Invoice - June - Swag
     Expense:Trade Show        $21.43 ; 502.50 CZK bez DPH
     EMEA:Q1:Swag Production  -$21.43
 
 2017-06-06 * Adam Samalik Travel & Accommodation for DORS/CLUC 2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/16
-    ; Payment: RH IE2519506
+    ; Payment: IE2519506
     Expense:Transportation         $105.25
     Expense:Lodging           $129.17
     EMEA:Q1:DORS/CLUC 2017   -$234.42
 
 2017-06-30 * Zacharias Mitzelos Meals at Fedora_26_Release_Event_Samos_Greece
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/19
-    ; Payment: CC jsimon
+    ; Payment: EMEA CC - July
     Expense:Meals            $101.20
     EMEA:Q2:F26 Parties     -$101.20
 
 2017-06-30 * Gergely Rakosi Flight to OSCAL_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/12
-    ; Payment: CC jsimon
+    ; Payment: EMEA CC - July
     Expense:Transportation        $217.15
     EMEA:Q1:OSCAL 2017      -$217.15
 
 2017-06-30 * Gergely Rakosi Lodging at OSCAL_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/13
-    ; Payment: CC jsimon
+    ; Payment: EMEA CC - July
     Expense:Lodging          $82.27
     EMEA:Q1:OSCAL 2017      -$82.27
 
 2017-06-30 * Gergely Rakosi Gasoline for OSCAL_2017
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/14
-    ; Payment: CC jsimon
+    ; Payment: EMEA CC - July
     Expense:Transportation        $79.94
     EMEA:Q1:DORS/CLUC 2017  -$79.94
 
 2017-07-24 * Fedora 26 Release Party - Novi Sad
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/21
-    ; Payment: bexelbie Meeting Card
-    Expense:Meals           -$88.85 ; 76.60 EUR
-    Expense:Meals:Paypal    -$4.56 ; 3.34 EUR
+    ; Payment: Meeting Card - July
+    Expense:Meals            $88.85 ; 76.60 EUR
+    Expense:Meals:Paypal     $4.56 ; 3.34 EUR
     EMEA:Q2:F26 Parties
 
-2017-07-31   Justin Flory
+2017-07-31 * Justin Flory
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/8
-    ; Payment: bexelbie Meeting Card
+    ; Payment: Meeting Card - August
     Expense:Transportation           $120.32
     Expense:Transportation:Paypal    $3.79
     EMEA:Q1:OSCAL 2017         -$124.11
 
-2017-08-18   Amazon.com (1/2)
+2017-08-18 * Amazon.com (1/2)
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/28
-    ; Payment: bexelbie Meeting Card
+    ; Payment: Meeting Card - August
     Expense:Other Marketing Costs   $689.18
     EMEA:Q2:Fedorators             -$689.18
 
-2017-08-18   Amazon.com (2/2)
+2017-08-18 * Amazon.com (2/2)
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/28
-    ; Payment: bexelbie Meeting Card
+    ; Payment: Meeting Card - August
     Expense:Other Marketing Costs   $39.95
     EMEA:Q2:Fedorators             -$39.95
 
-2017-08-21 * Tiskárna v Dubí s.r.o.
-    ; Payment: direct
+2017-08-21 * Tiskárna v Dubí s.r.o. - Fedora Handbooks
+    ; Payment: Invoice - August - Printing
     ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/27
     Expense:Printing/Reproduction           $427.96 ; 9 490,10 CZK (without VAT) - 11 483,00 CZK with VAT
     EMEA:Q2:Swag Production                -$427.96
+
+2017-08-21 * Christian Dersch
+    ; Payment: Meeting Card - August
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/26
+    Expense:Lodging                         $123.32 ; 104.25 EUR
+    EMEA:Q2:FrOSCon 2017                   -$123.32
+
+2017-08-21 * elioqoshi
+    ; Payment: Meeting Card - August
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/22
+    Expense:Meals                           $83.46
+    EMEA:Q2:F26 Parties                    -$83.46
+
+2017-09-14 * Christian Dersch
+    ; Payment: Meeting Card - September
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/25
+    Expense:Transportation                  $57.78 ; 48.46 EUR
+    EMEA:Q2:FrOSCon 2017                   -$57.78
+
+2017-10-24 * Zacharias Mitzelos
+    ; Payment: EMEA CC - October
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/24
+    Expense:Transportation                  $584.49 ; 478.03 EUR
+    EMEA:Q2:FrOSCon 2017                   -$584.49
+
+2017-11-03 * Tiskárna v Dubí s.r.o. - Fedora Handbooks (excess pages)
+    ; Payment: Invoice - November - Printing
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/27
+    Expense:Printing/Reproduction           $43.21 ; 950,50 CZK (without VAT)
+    EMEA:Q2:Swag Production                -$43.21
+
+2017-11-28 * Air Servia - Jona Azizaj
+    ; Payment: IE2669264 - bex EUR CC
+    Expense:Transportation                  $360.31
+    EMEA:Q4:34C3                           -$360.31
+
+2017-12-19 * Zacharias Mitzelos for FOSSCOMM
+    ; Payment: jsimon CC - December
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/29
+    Expense:Transportation                  $143.74 ; 117.06 EUR
+    EMEA:Q3:FOSSCOMM 2017                  -$143.74
+
+2017-12-19 * Zacharias Mitzelos 34C3 Ticket for Kohane
+    ; Payment: jsimon CC - December
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/30
+    Expense:Other Marketing Costs           $135.72 ; 110.53 EUR
+    EMEA:Q3:34C3                           -$135.72
+
+2017-12-19 * Dimitris Glaros Fuel for FOSSCOMM Transport
+    ; Payment: jsimon CC - December
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/31
+    Expense:Transportation                 $61.40 ; 50.00 EUR
+    EMEA:Q3:FOSSCOMM 2017                 -$61.40
+
+2017-12-22 * Jona Azizaj - Fosdem & DevConf
+    ; Payment: IE2680588 - bex CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/37
+    Expense:Transportation                  $356
+    EMEA:Q4:FOSDEM 2018                    -$356
+
+2017-12-22 * Jona Azizaj - Fosdem
+    ; Payment: IE2689094 - bex CC
+    ; Payment: bex CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/48
+    Expense:Transportation                  $61.61
+    EMEA:Q4:DevConf                        -$61.61
+
+2017-12-22 * Sachin Kamath - Fosdem
+    ; Payment: IE2689094 - bex CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/40
+    Expense:Transportation                  $61.61
+    EMEA:Q4:FOSDEM 2018                    -$61.61
+
+2018-01-03 * Sumantro Mukherjee - Fosdem
+    ; Payment: IE2689094 - bex CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/45
+    Expense:Transportation                  $792.40
+    EMEA:Q4:FOSDEM 2018                    -$792.40
+
+2018-01-02 * Justin Flory - Fosdem
+    ; Payment: IE2702089 - bex CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/39
+    Expense:Transportation                  $73.37
+    EMEA:Q4:FOSDEM 2018                    -$73.37
+
+2018-01-02 * Justin Flory, Sachin Kamath, Jona Azizaj Train to Plane for Fosdem
+    ; Payment: IE2689094 - bex CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/39,40,48
+    Expense:Transportation                  $38.00 ; 805 CZK group ticket
+    EMEA:Q4:FOSDEM 2018                    -$38.00
+
+2018-01-10 * Fabian Affolter - nullcon
+    ; Payment: jsimon CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/44
+    Expense:Transportation                  $974.22
+    EMEA:Q4:nullcon 2018                   -$974.22
+
+2018-01-04 * Hotels for FOSDEM 1
+    ; Payment: IE2689094 - bex CC
+    ; Ticket: Various FOSDEM
+    Expense:Lodging                         $1286.63
+    EMEA:Q4:FOSDEM 2018                    -$1286.63
+
+2018-01-04 * Hotels for FOSDEM 2
+    ; Payment: IE2689094 - bex CC
+    ; Ticket: Various FOSDEM
+    Expense:Lodging                         $556.66
+    EMEA:Q4:FOSDEM 2018                    -$556.66
+
+2018-02-01 * Fedora Buttons
+    ; Payment: Invoice
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/53
+    Expense:Trade Show                           $271.09 ; 5500 CZK w/o VAT
+    EMEA:Q4:Swag Production                     -$271.09
+
+2018-02-01 * Baggage Fee – Flory
+    ; Payment: IE2728261 - bex
+    Expense:Airfare    $46.84 ; 950 CZK
+    EMEA:Q4:FOSDEM 2018   -$46.84
+
+2018-02-01 * Baggage Fee – Kamath
+    ; Payment: IE2728261 - bex
+    Expense:Airfare    $46.84 ; 950 CZK
+    EMEA:Q4:FOSDEM 2018   -$46.84
+
+2018-02-01 * Baggage Fee – Azizaj
+    ; Payment: IE2728261 - bex
+    Expense:Airfare    $46.84 ; 950 CZK
+    EMEA:Q4:FOSDEM 2018   -$46.84
+
+2018-02-01 * Airport>Brussels Train for Fedorans
+    ; Payment: IE2728261 - bex
+    Expense:Train    $67.27 ; 54 EUR
+    EMEA:Q4:FOSDEM 2018   -$67.27
+
+2018-02-03 * Fedoran Bus Tickets
+    ; Payment: IE2728261 - bex
+    Expense:Taxi/Car Service    $26.24 ; 21 EUR
+    EMEA:Q4:FOSDEM 2018   -$26.24
+
+2018-02-04 * Fedoran Bus Tickets
+    ; Payment: IE2728261 - bex
+    Expense:Taxi/Car Service    $15.74 ; 12.6 EUR
+    EMEA:Q4:FOSDEM 2018   -$15.74
+
+2018-02-12 * Jona Azizaj 34C3 Tickets
+    ; Payment: jsimon CC - February 2018
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/33
+    Expense:Other Marketing Costs           $202.49 ; 158.63 EUR
+    EMEA:Q3:34C3
+
+2018-02-12 * Nemanja for DevConf
+    ; Payment: IE2751900 - bex CC February
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/49
+    Expense:Transportation                       $218.61 ; 178.41 EUR
+    EMEA:Q4:DevConf                             -$218.61
+
+2018-02-12 * Visa fee for DevConf - Sachin
+    ; Payment: IE2751900 - bex CC February
+    Expense:Transportation                       $96.52
+    EMEA:Q4:DevConf                             -$96.52
+
+2018-02-14 * Mitzelos @ FOSDEM
+    ; Payment: IE2751900 - bex CC February
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/55
+    Expense:Airfare                              $281.05 ; 227.30 EUR
+    Expense:Transportation                       $76.36 ; 61.76 EUR
+    Expense:Transportation:Paypal                $12.59 ; 10.18 EUR
+    EMEA:Q4:FOSDEM 2018                         -$370
+
+2018-02-14 * Balla @ FOSDEM
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/38
+    ; Payment: IE2751900 - bex CC February
+    Expense:Airfare                              $234.93 ; 190 EUR
+    Expense:Transportation                       $22.26 ; 18 EUR
+    Expense:Transportation:Paypal                $9.17 ; 7.42 EUR
+    EMEA:Q4:FOSDEM 2018                         -$266.36
+
+2018-02-14 * Janekova @ FOSDEM
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/36
+    ; Payment: IE2736424 - Radka Janekova
+    Expense:Airfare                              $301.83 ; 244.11 EUR
+    Expense:Transportation                       $62.55 ; 21 EUR + 751 CZK
+    Expense:Transportation                       $55.65 ; 45.01 EUR Uber
+    Expense:Lodging                              $19.78 ; 16 EUR
+    EMEA:Q4:FOSDEM 2018                         -$439.81
+
+2018-01-29 * Fedora/CentOS Bags for FOSDEM
+    ; Payment: Direct Bill
+    Expense:Trade Show                           $1904.57 ; 50% of 77376 CZK
+    EMEA:Q4:Swag Production                     -$1904.57
+
+2018-02-14 * Seriografika - stickers for EMEA
+    ; Payment: Direct Bill
+    ; Ticket: 
+    Expense:Trade Show                           $556.73 ; EUR450,80
+    EMEA:Q4:Swag Production                     -$556.73
+
+2018-02-16 * Azizaj @ Fosdem
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/37
+    ; Payment: IE2751900 - bex CC February
+    Expense:Transporation                        $31.20 ; 25 EUR
+    EMEA:Q4:FOSDEM 2018                         -$31.20
+
+2018-02-16 * Castillo @ Fosdem
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/50
+    ; Payment: IE2751900 - bex CC February
+    Expense:Transporation                        $168.99
+    EMEA:Q4:FOSDEM 2018                         -$168.99
+
+2018-02-16 * Chauvet @ Fosdem
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/52
+    ; Payment: IE2751900 - bex CC February
+    Expense:Airfare                              $111.49 ; 89.32 EUR
+    EMEA:Q4:FOSDEM 2018                         -$111.49
+
+2018-02-20 * FOSDEM Flory Hotel Tax
+    ; Payment: IE2804263 - bex CC
+    Expense:Lodging                              $20.92
+    EMEA:Q4:FOSDEM 2018                         -$20.92
+
+2018-03-13 * Swag Production
+    ; Payment: Direct Invoice
+    Expense:Tradeshow                            $171.65 ; 140 EUR Fedora Loves Python Stickers
+    EMEA:Q4:Swag Production                     -$171.65
diff --git a/FY18/ledger/fad.ldg b/FY18/ledger/fad.ldg
index 5d26995..479db26 100644
--- a/FY18/ledger/fad.ldg
+++ b/FY18/ledger/fad.ldg
@@ -6,7 +6,13 @@
     FADs:Council        -$376.56 ; additional TICKET: https://pagure.io/Fedora-Council/tickets/issue/124
     FADs:LATAM          -$5000 ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/116
     FADs:LATAM          -$1000 ; additional TICKET: https://pagure.io/Fedora-Council/tickets/issue/124
-    FADs:LATAM           $601.21 ; Sweep of underspend
+    FADs:LATAM           $601.80 ; Sweep of underspend
+    FADs:G11N           -$6800 ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/137
+    FADs:G11N           -$1200 ; Potential airfare overruns
+    FADs:G11N            $522.03 ; underspend sweep
+    FADs:CommOps        -$2635 ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/159 + $600 in underspend
+    FADs:CommOps        -$600  ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/159 + $600 in underspend <-- this is underspend
+    FADs:Docs           -$10385 ; TICKET: https://pagure.io/Fedora-Council/tickets/issue/174
     FADs:Unallocated    
 
 ~ every 2 years
@@ -37,7 +43,7 @@
     FADs:Council                             -$1162.98
 
 2017-04-07 * Fedora Council FAD Travel for Langdon White
-    ; Payment: IE2345916 - bex cc
+    ; Payment: IE2345916
     Expense:Transportation                    $362.14
     Expense:Finance Charges                   $14.42
     FADs:Council                             -$376.56
@@ -66,65 +72,262 @@
     FADs:InfraHack                           -$1337.42
 
 2017-06-23 * Travel for Eduard Lucena
-    ; Payment: bex Meeting Card 20170627
+    ; Payment: Meeting Card - June
     Expense:Transportation                    $501.01
     FADs:LATAM:Airfare                       -$501.01
 
 2017-06-27 * Travel for Chino Soliard
-    ; Payment:IE2541589 - bex CC
+    ; Payment: IE2541589
     Expense:Transportation                    $815.81
     Expense:Transportation:Agent Fee          $38
     FADs:LATAM:Airfare                       -$853.81
 
 2017-06-28 * Travel for Jose Reyes
-    ; Payment:IE2541589 - bex CC
+    ; Payment: IE2541589
     Expense:Transportation                    $980.10
     Expense:Transportation:Agent Fee          $38
     FADs:LATAM:Airfare                       -$1018.10
 
 2017-06-30 * Travel for Itamar Peixoto
-    ; Payment:IE2541589 - bex CC
+    ; Payment: IE2541589
     Expense:Transportation                    $1121.39
     Expense:Transportation:Agent Fee          $38
     FADs:LATAM:Airfare                       -$1159.39
 
 2017-07-07 * Travel for Samuel Gutierrez Aviles
-    ; Payment: bex meeting card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1279.54
     FADs:LATAM:Airfare                       -$1279.54
 
 2017-07-12 * Lunch for 6 + 2 tip
-    ; Payment: IE2551677 - bex
+    ; Payment: IE2551677
     Expense:Meals    $15.72 ; 50 PEN
     FADs:LATAM:Food
 
 2017-07-13 * Lunch for 8 + 6 tip
-    ; Payment: IE2551677 - bex
+    ; Payment: IE2551677
     Expense:Meals    $22.01 ; 70 PEN
     FADs:LATAM:Food
 
 2017-07-14 * Lunch for 8
-    ; Payment: IE2551677 - bex
+    ; Payment: IE2551677
     Expense:Meals    $19.49 ; 62 PEN
     FADs:LATAM:Food
 
 2017-07-15 * Tip for Lunch
-    ; Payment: IE2551677 - bex
+    ; Payment: IE2551677
     Expense:Meals    $9.43 ; 30 PEN
     FADs:LATAM:Food
 
 2017-07-15 * Hotel for FAD people
-    ; Payment: IE2551677 - bex
+    ; Payment: IE2551677
     Expense:Lodging    $451.13 ; 1435 PEN
     FADs:LATAM:Lodging
 
 2017-07-15 * Bus for Tonet
-    ; Payment: IE2551677 - bex
+    ; Payment: IE2551677
     Expense:Transportation    $17.29 ; 55 PEN
     FADs:LATAM:Travel
 
 2017-07-15 * Lunch for 9
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Meals    $51.28 ; 165 PEN
     FADs:LATAM:Food
 
+2017-09-26 * Mike Fabian Airfare
+    ; Payment: Meeting Card - October
+    Expense:Transportation                  $794.60
+    FADs:G11N:Transportation
+
+2017-09-27 * Jens Petersen Airfare
+    ; Payment: Meeting Card - October
+    Expense:Transportation                  $1070.30
+    FADs:G11N:Transportation
+
+2017-09-28 * Rafal Luzynski
+    ; Payment: Meeting Card - October
+    Expense:Transportation                  $91.00
+    Expense:Transportation                  $719.80
+    FADs:G11N:Transportation
+
+2017-09-29 * Peng Wu
+    ; Payment: Meeting Card - October
+    Expense:Transportation                  $38
+    Expense:Transportation                  $38
+    Expense:Transportation                  $3.09 ; fee for charge
+    Expense:Transportation                  $658.3
+    FADs:G11N:Transportation
+
+2017-09-29 * Akira Tagoh
+    ; Payment: Meeting Card - October
+    Expense:Transportation                  $995.40
+    FADs:G11N:Transportation
+
+2017-10-02 * Fujiwara Takao
+    ; Payment: Meeting Card - October
+    Expense:Transportation                  $38
+    Expense:Transportation                  $38
+    Expense:Transportation                  $444.40
+    Expense:Transportation                  $386.80
+    FADs:G11N:Transportation
+
+2017-11-28 * Accomodation for G11N FAD
+    ; Payment: RHIPL2652961 - Pravin
+    Expense:Lodging                         $1495.01 ; Tagoh, Wu, Fabian, Fujiwara, Petersen, Luzynski
+    FADs:G11N                              -$1495.01
+
+2017-11-28 * Meals for G11N FAD
+    ; Payment: RHIPL2651918 - Parag
+    Expense:Meals                           $221.19
+    FADs:G11N                              -$221.19
+
+2017-12-20 * Airfare for Sachin Kamath
+    ; Payment: IE2680588 - bex CC
+    Expense:Transportation                  $764.30
+    Expense:Transportation                  $38.00
+    FADs:CommOps                           -$802.30
+
+2017-12-22 * Ground Transportation Direct Bill
+    ; Payment: Direct Bill
+    Expense:Transportation                  $446.08 ; 28308 INR
+    FADs:G11N:Transportation
+
+2018-01-02 * Bus for Sachin Kamath (VIE->Brno)
+    ; Payment: IE2689094 - bex CC
+    Expense:Transportation                  $17.95 ; 14.9 EUR
+    FADs:CommOps                           -$17.95
+
+2018-01-02 * Airfare for Justin Flory
+    ; Payment: IE2689094 - bex CC
+    Expense:Transportation                  $1332.71
+    FADs:CommOps                           -$1332.71
+
+2018-01-16 * Airfare for Bee Padalkar
+    ; Payment: bex Pcard
+    Expense:Transportation                  $132.37
+    FADs:CommOps                           -$132.37
+
+2018-01-16 * Train1 for Bee Padalkar
+    ; Payment: IE2702089 - bex CC
+    Expense:Transportation                  $54.93
+    FADs:CommOps                           -$54.93
+
+2018-01-16 * Train2 for Bee Padalkar
+    ; Payment: IE2702089 - bex CC
+    Expense:Transportation                  $8.56
+    FADs:CommOps                           -$8.56
+
+2018-01-22 * Universal Tickets for Fedora CommOps, Jim, Jen, Jered
+    ; Payment: IE2728279 - bex
+    Expense:Taxi/Car Service    $60.14 ; 1248 CZK
+    FADs:CommOps   -$60.14
+
+2018-01-23 * Hotel for CommOps FAD (+ some DevConf)
+    ; Payment: IE2728279 - bex
+    Expense:Lodging    $799.1 ; 16575.02 CZK
+    FADs:CommOps   -$799.1
+
+2018-01-23 * Bus for Jona Azizaj
+    ; Payment: IE2728279 - bex
+    Expense:Transportation                  $19.57 ; 16 EUR
+    FADs:CommOps                           -$19.57
+
+2018-01-24 * Bus for Justin Flory
+    ; Payment: bex CC
+    Expense:Transportation                  $19.57 ; 16 EUR
+    FADs:CommOps                           -$19.57
+
+2018-01-29 * FAD + Dennis Dinner
+    ; Payment: IE2728332 - bex
+    Expense:Business Meals    $171.3 ; 3500 CZK
+    FADs:CommOps   -$171.3
+
+2018-01-30 * Commops FAD Dinner + Jim, Amy, Dennis
+    ; Payment: IE2728279 - bex
+    Expense:Business Meals    $112.78 ; 2300 CZK
+    FADs:CommOps   -$112.78
+
+2018-01-30 * FAD Lunch – pizza
+    ; Payment: IE2728279 - bex
+    Expense:Business Meals    $58.15 ; 1186 CZK
+    FADs:CommOps   -$58.15
+
+2018-01-30 * 3 x Universal Tram Tickets – FAD
+    ; Payment: IE2728332 - bex
+    Expense:Taxi/Car Service    $22.95 ; 468 CZK
+    FADs:CommOps   -$22.95
+
+2018-01-31 * FAD + Dennis Gilmore Dinner
+    ; Payment: IE2728279 - bex
+    Expense:Business Meals    $44.35 ; 900 CZK
+    FADs:CommOps   -$44.35
+
+2018-01-31 * Lunch for FAD
+    ; Payment: IE2728279 - bex
+    Expense:Business Meals    $25.43 ; 516 CZK
+    FADs:CommOps   -$25.43
+
+2018-02-13 * Flight - Marr
+    ; Payment: IE2751900 - bex CC February
+    Expense:Airfare             $2378.41
+    FADs:Docs                  -$2378.41
+
+2018-02-13 * Flight - Mayorga
+    ; Payment: bex Pcard - February
+    Expense:Airfare             $1435.08
+    FADs:Docs                  -$1435.08
+
+2018-02-14 * Flight - Smith
+    ; Payment: IE2751900 - bex CC February
+    Expense:Airfare             $1878.01
+    FADs:Docs                  -$1878.01
+
+2018-02-14 * Bus - Mayorga (reduces flight)
+    ; Payment: IE2751900 - bex CC February
+    Expense:Transportation           $32.02
+    FADs:Docs                       -$32.02
+
+2018-02-14 * Train - Mayorga (reduces flight)
+    ; Payment: IE2751900 - bex CC February
+    Expense:Transportation           $66.71
+    FADs:Docs                       -$66.71
+
+2018-02-16 * Justin Flory Bus Ticket (reduces airfare)
+    ; Payment: IE2751900 - bex CC February
+    Expense:Transportation      $39.78
+    FADs:Docs                  -$39.78
+
+2018-02-14 * CommOps Food Expense
+    ; Payment: IE2736424 - Radka Janekova
+    Expense:Meals               $60.80 ; 1235 CZK
+    FADs:CommOps               -$60.80
+
+2018-02-14 * Flight - Assam
+    ; Payment: Pcard - February
+    Expense:Airfare             $1721.01
+    FADs:Docs                  -$1721.01
+
+2018-02-25 * Dinner for 9 Docs FAD people
+    ; Payment: Pcard - February
+    Expense:Meals    $279.05 ; 226.16 EUR
+    FADs:Docs   -$279.05
+
+2018-02-26 * Dinner for 11 – FAD
+    ; Payment: IE2802515 - bex
+    Expense:Business Meals    $416.31 ; 337.9 EUR
+    FADs:Docs   -$416.31
+
+2018-02-27 * Lunch for 11 – FAD
+    ; Payment: IE2802515 - bex
+    Expense:Business Meals    $169.58 ; 137.85 EUR
+    FADs:Docs   -$169.58
+
+2018-02-27 * Dinner for 11 – FAD
+    ; Payment: IE2802515 - bex
+    Expense:Business Meals    $407.3 ; 331.1 EUR
+    FADs:Docs   -$407.3
+
+2018-02-28 * Dinner for 12 – FAD
+    ; Payment: IE2802515 - bex
+    Expense:Business Meals    $298.46 ; 244.4 EUR
+    FADs:Docs   -$298.46
diff --git a/FY18/ledger/fedora.ledger b/FY18/ledger/fedora.ledger
index dd10fe9..edfe786 100644
--- a/FY18/ledger/fedora.ledger
+++ b/FY18/ledger/fedora.ledger
@@ -1,2 +1 @@
-include validator.ledger
 include *.ldg
diff --git a/FY18/ledger/flock.ldg b/FY18/ledger/flock.ldg
index 5cbfdc8..3ce41fb 100644
--- a/FY18/ledger/flock.ldg
+++ b/FY18/ledger/flock.ldg
@@ -1,30 +1,133 @@
 ~ every 2 years
     ; Budget
-    Flock                  $85000
-    Flock:Meeting Room     -$0    ; Rental is complimentary with 320 Room Nights
-    Flock:Schedule         -$200 ; sched.org
-    Flock:Photographer     -$3000
-    Flock:T-shirt          -$2398 ; 250 T-shirts - 3 colors on 2 sides
-    Flock:Badges           -$150  ; 300 badges
-    Flock:Booklet          -$0    ; **MISSING**
-    Flock:AV               -$11,256
-    Flock:Bandwidth        -$300
-    Flock:Activities       -$2000 ; Professor Wackenhammer's evening event (venue/rides)
-    Flock:Activities       -$1471 ; Professor Wackenhammer's evening event (tent) - Bayside Tents
-    Flock:Food             -$3000 ; Professor Wackenhammer's evening event (drinks) $250 bartenders $250 setup fee 250 people * 2 beers * $5 (craft beer)
-    Flock:Food             -$5050 ; Professor Wackenhammer's evening event (food) Bon Me Entree + 1 option: $700 travel cost + $200 late night fee + $2140 ($2000 + 7% tax) 100 people with entree + 1 option+  $2006.25 ($12.50/pp + 7% tax) 150 people with entree + 1 option
-    Flock:Food             -$3300 ; @ 200 people 16.50/pp (no drinks)
-    Flock:Food             -$0    ; **MISSING** Lunch for paid registrants
-    Flock:Supplies         -$100
-    Flock:Supplies         -$175  ; sched.org
-    Flock:Unallocated:Registration      $0
-    Flock:Unallocated:Registration:Extra           $0
-    Flock:Unallocated:Registration:Paypal Fee      $0
-    Flock:Unallocated:Copay Owed        $0
-    Flock:Unallocated:Sponsorship       $0
+    Flock                         $85000 ; allocated by council
+    ; Expenses
+    Flock:AV                     -$11,256
+    Flock:Activities             -$2000 ; Professor Wackenhammer's evening event (venue/rides)
+    Flock:Activities             -$1471 ; Professor Wackenhammer's evening event (tent) - Bayside Tents
+    Flock:Badges                 -$150  ; 300 badges
+    Flock:Bandwidth              -$300
+    Flock:Booklet                -$0    ; **MISSING**
+    Flock:Food                   -$3000 ; Professor Wackenhammer's evening event (drinks) $250 bartenders $250 setup fee 250 people * 2 beers * $5 (craft beer)
+    Flock:Food                   -$5050 ; Professor Wackenhammer's evening event (food) Bon Me Entree + 1 option: $700 travel cost + $200 late night fee + $2140 ($2000 + 7% tax) 100 people with entree + 1 option+  $2006.25 ($12.50/pp + 7% tax) 150 people with entree + 1 option
+    Flock:Food                   -$3300 ; @ 200 people 16.50/pp (no drinks)
+    Flock:Food                   -$0    ; **MISSING** Lunch for paid registrants
+    Flock:Food:Sponsored Food    -$5000
+    Flock:Meeting Room           -$0    ; Rental is complimentary with 320 Room Nights
+    Flock:Photographer           -$3000
+    Flock:Schedule               -$200 ; sched.org
+    Flock:Supplies               -$100
+    Flock:Supplies               -$175  ; sched.org
+    Flock:T-shirt                -$2398 ; 250 T-shirts - 3 colors on 2 sides
+    Flock:Paypal Fees            -$0 ;
+    ; Copays
+    Flock:Copaid Travel          -$0 ; 
+    ; Balance
     Flock:Unallocated
 
 ~ every 2 years
+    ; Sponsorships Committed
+    Budget:Flock:Sponsors                      $5000 ; Capital One - not yet received - billed in Feb 2018
+    Budget:Flock:Sponsors                      $1500 ; openSUSE - not yet received
+    Budget:Flock:Sponsors                      $5000 ; RHEL
+    Flock:Unallocated                         -$11500
+
+2017-08-01 * Flock Sponsorship Paid
+    ; Date arbitrary
+    ; Payment: Internal Transfer - Flock Sponsorship
+    Budget:Flock:Sponsors                      $5000 ; RHEL
+    External:Flock:Sponsors                   -$5000
+
+~ every 2 years
+    ; Registration
+    Budget:Flock:Registration                  $3858.6 ; includes extras to support others
+    Budget:Flock:Other                         $27 ; Payment: Kanika via paypal 2017-08-08 * Payment for accidentally bought bus ticket see 2017-08-05 entry
+    Flock:Unallocated
+
+2017-11-06 * Registration settled
+    ; Registration
+    ; Payment: Inbound Paypal - Flock
+    Budget:Flock:Registration                  $3858.6 ; includes extras to support others
+    External:Flock:Registration               -$3858.60 ; Paypal
+    Budget:Flock:Other                         $27 ; Payment: Kanika via paypal 2017-08-08 * Payment for accidentally bought bus ticket see 2017-08-05 entry
+    External:Flock:Other                      -$27 ; Paypal
+
+2017-11-06 * Registration settled Fees
+    ; Registration Fees
+    ; Payment: Inbound Paypal - Flock
+    Expense:Finance Charges                    $213.09 ; paypal fees
+    Expense:Finance Charges                    $1.76 ; paypal fees
+    Flock:Paypal Fees            
+
+~ every 2 years
+    ; Copays
+    Budget:Flock:Copays                        $605 ; 1 * transfer paid
+    Budget:Flock:Copays                        $620 ; 2 * transfer paid
+    Budget:Flock:Copays                        $299 ; 3 * transfer paid
+    Budget:Flock:Copays                        $582.96 ; 10 * transfer paid
+    Budget:Flock:Copays                        $605 ; 12 * transfer paid
+    Budget:Flock:Copays                        $306 ; 17 * transfer paid
+    Budget:Flock:Copays                        $160 ; 20 * transfer - paid
+    Budget:Flock:Copays                        $109.20 ; 6 * paid
+    Budget:Flock:Copays                        $150 ; 7 * paid and receipt filed
+    Budget:Flock:Copays                        $209 ; 15 * paid
+    Budget:Flock:Copays                        $245 ; 13 * paid
+    Budget:Flock:Copays                        $314 ; 9 * paid
+    Budget:Flock:Copays                        $40  ; 4 * paid
+    Budget:Flock:Copays                        $48.80 ; 6 * paid
+    Budget:Flock:Copays                        $69 ; 14 * paid
+    Budget:Flock:Copays                        $92.19; 18 * paid
+    Budget:Flock:Copays                        $100 ; 16 * paid
+    Budget:Flock:Copays                        $229 ; 5 * paid
+    Budget:Flock:Copays                        $158 ; 8 * paid
+    Budget:Flock:Copays                        $66 ; 11 * reverse transfer paid to airline
+    Budget:Flock:Copays                        $140 ; 19 * reverse transfer paid to airline
+    Budget:Flock:Copays                        $100 ; 21 * reverse transfer paid to airline
+    Budget:Flock:Copays                        $357.96 ; 22 * reverse transfer paid to airline
+    Flock:Copaid Travel   
+
+2017-11-06 * Copays settled
+    ; Copays
+    ; Payment: Internal Transfer - Flock Copay
+    Budget:Flock:Copays                        $3287.16; Copays paid as internal RH transfers
+    External:Flock:Copays                     -$3287.16; RH transfers
+
+2017-11-06 * Copays settled
+    ; Copays
+    ; Payment: Copays paid directly to the airline
+    Budget:Flock:Copays                        $663.96 ; Copays Paid directly to airline
+    External:Flock:Copays                     -$663.96 ; Paid directly to airline
+
+2017-11-06 * Copays settled
+    ; Copays
+    ; Payment: External to System
+    Budget:Flock:Copays                        $119.97 ; direct paid for ticket
+    External:Flock:Copays                     -$119.97 ; direct paid for ticket
+
+2017-11-06 * Copays settled
+    ; Copays
+    ; Payment: Inbound Paypal - Flock
+    Budget:Flock:Copays                        $1377.02 ; Copays Received (as USD)
+    Budget:Flock:Copays                        $158.00 ; Copays Received (as EUR)
+    External:Flock:Copays                     -$1535.02 ; Paypal
+
+2017-09-02 * Copays/etc. Charged to Transportation
+    ; Payment: Allocate Flock Copays
+    Expense:Transportation                     $3287.16; Copays paid as internal RH transfers
+    Expense:Transportation                     $663.96 ; Copays Paid directly to airline
+    Expense:Transportation                     $119.97 ; direct paid for ticket
+    Expense:Transportation                     $1377.02 ; Copays Received (as USD)
+    Expense:Transportation                     $158.00 ; Copays Received (as EUR)
+    Flock:Copaid Travel   
+
+2017-11-06 * Copays settled Fees
+    ; Copays Fees
+    ; Payment: Inbound Paypal - Flock
+    Expense:Finance Charges                   -$8.40 ; paypal fees
+    Expense:Finance Charges                   -$9.95 ; paypal fees
+    Flock:Paypal Fees            
+
+~ every 2 years
     ; Funding Allocations
     ; herlo@fedoraproject.org
     Flock:Funding:Travel        -$290
@@ -209,63 +312,69 @@
 2017-03-29 * Resort and Conference Center at Hyannis
     ; Payment: Requisition 27909 - Order 1010066678
     ; Deposit toward expenses
-    Expense:Lodging             $2000 ; Deposit
+    Expense:Lodging:Deposit             $2000 ; Deposit
     Flock:Funding:Lodging      -$2000
 
 2017-06-06 * Resort and Conference Center at Hyannis
     ; Payment: Requisition 27909 - Order 1010066678
     ; Deposit toward expenses
-    Expense:Lodging             $10000 ; Deposit
+    Expense:Lodging:Deposit             $10000 ; Deposit
     Flock:Funding:Lodging      -$10000
 
+2017-06-13 * Resort and Conference Center at Hyannis
+    ; Payment: Meeting Card - jmadriaga - June
+    ; Deposit toward expenses
+    Expense:Lodging:Deposit             $1200 ; Deposit
+    Flock:Funding:Lodging      -$1200
+
 2017-07-21 * Bon Me (Catering for Evening Activity)
-    ; Payment: jmadriaga Meeting Card
+    ; Payment: Meeting Card - jmadriaga - July
     Expense:Meals                             $1000 ; Deposit
     Flock:Food                               -$1000
 
 2017-06-24 * Wackenhammer
-    ; Payment:IE2541589 - bex CC
+    ; Payment: IE2541589
     Expense:Trade Show        $2000
     Flock:Activities         -$2000
 
 2017-07-07 * Air: Adam Samalik
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1149.66
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1187.66
 
 2017-07-07 * Air: Tomas Tomecek
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1154.16
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1192.16
 
 2017-07-10 * Air: Kanika Murarka
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1550.66
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1588.66
 
 2017-07-10 * Air: Sumantro Mukherjee
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1550.66
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1588.66
 
 2017-07-10 * Air: Jonathan Dieter
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $423.99
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$461.99
 
 2017-07-11 * Air: David Silva
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $961.86
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$999.86
 
 2017-07-11 * Air
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $766.88 ; Robert Mayr
     Expense:Transportation                    $577.88 ; Gabriele Trombini
     Expense:Transportation                    $806.88 ; Andrea Masala
@@ -273,173 +382,174 @@
     Flock:Funding:Travel                     -$2314.57
 
 2017-07-11 * Air: Sachin Kamath
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $1268.36
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1306.36
 
 2017-07-11 * Air: Yu Zhang
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $254.39
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$292.39
 
 2017-07-11 * Air: Eduardo Mayorga
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $981.89
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1019.89
 
 2017-07-11 * Air: Nicholas Bebout
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $434.6
     Expense:Transportation:Agent Fee          $19
     Flock:Funding:Travel                     -$453.6
 
 2017-07-11 * Air: Amita Sharma
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $1365.56
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1403.56
 
 2017-07-11 * sched.org
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Outside Services/Training           $125
     Flock:Schedule                             -$125
 
 2017-07-12 * Air: Petr Hracek
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1177.96
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1215.96
 
 2017-07-12 * Air: Jan Scotka
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1200
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1238
 
 2017-07-12 * Air: Clinton Savage
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $313.39
     Expense:Transportation:Agent Fee          $19
     Flock:Funding:Travel                     -$332.39
 
 2017-07-12 * Air: Jona Azizaj
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $785.21
     Flock:Funding:Travel                     -$785.21
 
 2017-07-12 * Air: Adam Williamson
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $260.79
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$298.79
 
 2017-07-12 * Air: Chhavi Shrivastava
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1361.76
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1399.76
 
 2017-07-13 * Air: Mahamed Fawzi
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1535.76
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1573.76
 
-2017-07-17   Cancelled Air: Mohammed Fawzi
+2017-07-17 * Cancelled Air: Mohammed Fawzi
+    ; Payment: Meeting Card - July
     Expense:Transportation                   -$1535.76
     Flock:Funding:Travel                      $1535.76
 
 2017-07-14 * Air: Rafal Luzynski
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $655.36
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$693.36
 
 2017-07-17 * Air: Tim Flink
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $187.86
     Expense:Transportation:Agent Fee          $19
     Flock:Funding:Travel                     -$206.86
 
 2017-07-18 * Air: Marie Nordin
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $318.05
     Expense:Transportation:Agent Fee          $19
     Flock:Funding:Travel                     -$337.05
 
 2017-07-18 * Air: Ioannis Konstantinidis
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $808.16
     Expense:Transportation:Agent Fee          $4.54
     Flock:Funding:Travel                     -$812.70
 
 2017-07-19 * Air: Lukas Brabec
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1050.66
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1088.66
 
 2017-07-20 * Laminating Pouches for Door Signs
-    ; Payment: jmadriaga Meeting Card
+    ; Payment: Meeting Card - jmadriaga - July
     Expense:Office Supplies                   $12.99
     Flock:Supplies                           -$12.99
 
 2017-07-20 * Air: Jens Petersen
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $1136.16
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1174.16
 
 2017-07-24 * Air: Mariia Leonova
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $756.76
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$794.76
 
 2017-07-24 * Air: Jiri Eischmann
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $914.31
     Flock:Funding:Travel                     -$914.31
 
 2017-07-24 * Air: Zacharias Mitzelos    
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $685.42
     Flock:Funding:Travel                     -$685.42
 
 2017-07-24 * Air: Till Maas
-    ; Payment: IE2551629 bex CC
+    ; Payment: IE2551629
     Expense:Transportation                    $600.41
     Flock:Funding:Travel                     -$600.41
 
 2017-07-25 * Air: Mariana Balla
-    ; Payment: bex Meeting Card
+    ; Payment: Meeting Card - July
     Expense:Transportation                    $827.76
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$865.76
 
-2017-07-26   Air: David Labsky
-    ; Payment: bex Meeting Card
+2017-07-26 * Air: David Labsky
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $835.36
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$873.36
 
-2017-07-28   Air: Fabian Affolter
-    ; Payment: bex Meeting Card
+2017-07-28 * Air: Fabian Affolter
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $1035.36
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$1073.36
 
-2017-07-28   Air: Alex Eng
-    ; Payment: bex Meeting Card
+2017-07-28 * Air: Alex Eng
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $826
     Expense:Transportation:Agent Fee          $38
     Flock:Funding:Travel                     -$864
 
-2017-07-31   P-B Bus
-    ; Payment: bex Meeting Card
+2017-07-31 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $931
     Flock:Funding:Bus                        -$931
     ; 19 round trip tickets
@@ -463,8 +573,8 @@
     ; Nicholas	Edward	Bebout
     ; Timothy	Richard	Flink
 
-2017-07-31   P-B Bus
-    ; Payment: bex Meeting Card
+2017-07-31 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $135
     Flock:Funding:Bus                        -$135
     ; 5 one-way tickets
@@ -474,46 +584,47 @@
     ; Jiri		Eischmann
     ; Jona		Azizaj
 
-2017-07-31   P-B Bus
-    ; Payment: bex Meeting Card
+2017-07-31 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $38
     Flock:Funding:Bus                        -$38
     ; 2 one way
     ; Alexander		Bokovoy
     ; Mariia		Leonova
 
-2017-07-31   P-B Bus
-    ; Payment: bex Meeting Card
+2017-07-31 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $49
     Flock:Funding:Bus                        -$49
     ; 2 one way
     ; Alexander		Bokovoy
     ; Mariia		Leonova
 
-2017-07-31   P-B Bus
-    ; Payment: bex Meeting Card
+2017-07-31 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $38
     Flock:Funding:Bus                        -$38
     ; Zacharias		Mitzelos
 
-2017-07-31   P-B Bus
-    ; Payment: bex Meeting Card
+2017-07-31 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $27
     Flock:Funding:Bus                        -$27
     ; Chhavi	Gopal	Shrivastava
 
-2017-07-31   Peter Pan
-    ; Payment: bex Meeting Card
+2017-07-31 * Peter Pan
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $71.50
     Flock:Funding:Bus                        -$71.50
     ; Chhavi	Gopal	Shrivastava
 
 2017-08-02 * Andrea Masala
+    ; Payment: External to the system
     Expense:Transportation                    $119.97
     Flock:Funding:Other                      -$119.97
 
-2017-08-02   P-B Bus
-    ; Payment: bex Meeting Card
+2017-08-02 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $245
     Flock:Funding:Bus                        -$245
     ; David Carlos	De Araújo Silva	
@@ -522,121 +633,203 @@
     ; Sundeep		Anand
     ; Jan		Ščotka
 
-2017-08-02   P-B Bus
-    ; Payment: bex Meeting Card
+2017-08-02 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $38
     Flock:Funding:Bus                        -$38
     ; Sin	Loon	Eng
 
 2017-08-03 * All Media Production
-    ; Payment: jmadriaga meeting card
+    ; Payment: Meeting Card - jmadriaga - August
     Expense:Outside Services/Training         $500 ; deposit
     Flock:Photographer                       -$500 ; deposit
 
-2017-08-05   P-B Bus
-    ; Payment: bex Meeting Card
+2017-08-05 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $27
-    Flock:Funding:Bus                        -$27
-    ; Accidentally Bought
+    Flock                                    -$27
+    ; Accidentally Bought - later sold to an attendee
 
-2017-08-05   P-B Bus
-    ; Payment: bex Meeting Card
+2017-08-05 * P-B Bus
+    ; Payment: Meeting Card - August
     Expense:Transportation                    $54
     Flock:Funding:Bus                        -$54
     ; David		Labsky
     ; Ioannis		Konstantinidis
 
-2017-08-06   P-B Bus
-    ; Payment: bex Meeting Card
-    Expense:Transportation                    $61
-    Flock:Funding:Bus                        -$61
+2017-08-06 * P-B Bus
+    ; Payment: Meeting Card - August
+    Expense:Transportation                    $81
+    Flock:Funding:Bus                        -$81
     ; Clinton	Michael	Savage
     ; Pravin		Satpute
 
-2017-08-08   Sponsors
-    Flock:Unallocated:Sponsorship              $5000 ; Capital One
-    Flock:Unallocated:Sponsorship              $5000 ; openSUSE
-    Flock:Unallocated:Sponsorship              $5000 ; RHEL - submitted
-    External
-
-2017-08-08 * Payment for accidentally bought bus ticket
-    ; Payment: Kanika via paypal
-    Flock:Funding:Bus                        -$27
-    External
-
-2017-08-08   Lanyards
-    ; Payment: bex Meeting Card
+2017-08-08 * Badges
+    ; Payment: Meeting Card - August
     Flock:Badges                             -$52.07
-    External
+    Expense:Trade Show
 
 2017-08-09 * Lanyards
-    ; Payment: jmadriaga meeting card
+    ; Payment: Meeting Card - jmadriaga - August
     Flock:Badges                             -$91.08
-    External
+    Expense:Trade Show
 
 2017-08-11 * Professional Bartending Service
-    ; Payment: jmadriaga meeting card
-    Expense:Meals                                 -$500 ; setup plus bartenders drinks on consumption
+    ; Payment: Meeting Card - jmadriaga - August
+    Expense:Meals                                 $500 ; setup plus bartenders drinks on consumption
     Flock:Food
 
-2017-08-17   Cape Cod Textile
-    ; Payment: in progress ...
+2017-08-22 * Cape Cod Textile
+    ; Payment: Meeting Card - August
     Expense:Trade Show                             $2398
     Flock:T-shirt                                 -$2398
 
-2017-07-01   Copays/etc. owed
-    Flock:Unallocated:Copay Owed                  -$605 ; 1 * transfer paid
-    Flock:Unallocated:Copay Owed                  -$620 ; 2 * transfer paid
-    Flock:Unallocated:Copay Owed                  -$299 ; 3 * transfer paid
-    Flock:Unallocated:Copay Owed                  -$40  ; 4 - paid
-    Flock:Unallocated:Copay Owed                  -$229 ; 5 - paid
-    Flock:Unallocated:Copay Owed                  -$158 ; 6 * paid
-    Flock:Unallocated:Copay Owed                  -$150 ; 7 * paid and receipt filed
-    Flock:Unallocated:Copay Owed                  -$158 ; 8 * paid
-    Flock:Unallocated:Copay Owed                  -$314 ; 9 * paid
-    Flock:Unallocated:Copay Owed                  -$582.96 ; 10 * transfer paid
-    Flock:Unallocated:Copay Owed                  -$66 ; 11 - paid
-    Flock:Unallocated:Copay Owed                  -$605 ; 12 * transfer paid
-    Flock:Unallocated:Copay Owed                  -$245 ; 13 * paid
-    Flock:Unallocated:Copay Owed                  -$69 ; 14 * paid
-    Flock:Unallocated:Copay Owed                  -$209 ; 15 * paid
-    Flock:Unallocated:Copay Owed                  -$100 ; 16 - paid
-    Flock:Unallocated:Copay Owed                  -$306 ; 17 * paid
-    Flock:Unallocated:Copay Owed                  -$92.19; 18 * paid
-    Flock:Unallocated:Copay Owed                  -$140 ; 19 - reverse transfer paid
-    Flock:Unallocated:Copay Owed                  -$160 ; 20 * transfer - paid
-    Flock:Unallocated:Copay Owed                  -$100 ; 21 - reverse transfer paid
-    Flock:Unallocated:Copay Owed                  -$357.96 ; 22 - paid
-    Expense:Transportation
-
-2017-07-14   Paypal Placeholder
-    Flock:Unallocated:Registration                 $3139.03
-    Flock:Unallocated:Registration                 $25 ; - transfer
-    Flock:Unallocated:Registration:Extra           $405.65 ; Extra paid to support others
-    Flock:Unallocated:Registration:Paypal Fee     -$206.30
-    Flock:Unallocated:Registration:Paypal Fee     -$9.13 ; expected EUR conversion fee - 8 - paid
-    Flock:Unallocated:Copay Owed                   $605 ; 1 * transfer paid - submitted
-    Flock:Unallocated:Copay Owed                   $620 ; 2 * transfer paid - submitted
-    Flock:Unallocated:Copay Owed                   $299 ; 3 * transfer paid - submitted
-    Flock:Unallocated:Copay Owed                   $40  ; 4 - paid
-    Flock:Unallocated:Copay Owed                   $119.97 ; 5 - paid directly
-    Flock:Unallocated:Copay Owed                   $109.03 ; 5 - paid
-    Flock:Unallocated:Copay Owed                   $109.2 ; 6 * paid directly
-    Flock:Unallocated:Copay Owed                   $48.8 ; 6 - paid
-    Flock:Unallocated:Copay Owed                   $150 ; 7 * paid and receipt filed
-    Flock:Unallocated:Copay Owed                   $158 ; 8 * paid
-    Flock:Unallocated:Copay Owed                   $314 ; 9 * paid
-    Flock:Unallocated:Copay Owed                   $582.96 ; 10 * transfer paid - submitted
-    Flock:Unallocated:Copay Owed                   $66 ; 11 - paid
-    Flock:Unallocated:Copay Owed                   $605 ; 12 * transfer paid - submitted
-    Flock:Unallocated:Copay Owed                   $245 ; 13 * paid
-    Flock:Unallocated:Copay Owed                   $69 ; 14 * paid
-    Flock:Unallocated:Copay Owed                   $209 ; 15 * paid
-    Flock:Unallocated:Copay Owed                   $100 ; 16 - paid
-    Flock:Unallocated:Copay Owed                   $306 ; 17 * transfer paid - submitted
-    Flock:Unallocated:Copay Owed                   $92.19 ; 18 * paid
-    Flock:Unallocated:Copay Owed                   $140 ; 19 - reverse transfer paid
-    Flock:Unallocated:Copay Owed                   $160 ; 20 * transfer - paid - submitted
-    Flock:Unallocated:Copay Owed                   $100 ; 21 - reverse transfer paid
-    Flock:Unallocated:Copay Owed                   $357.96 ; 22 - paid
-    External
+2017-08-22 * Staples
+    ; Payment: Meeting Card - August
+    Expense:Office Supplies                        $324 ; easels and easel pads
+    Flock:Supplies                                -$324
+    
+2017-08-22 * Staples
+    ; Payment: Meeting Card - August
+    Expense:Office Supplies                        $273.73 ; Webcams, harddrive, stickers
+    Flock:Supplies                                -$273.73
+
+2017-08-26 * Staples
+    ; Payment: Meeting Card - September
+    Expense:Printing/Reproduction                  $619.98
+    Flock:Booklet                                 -$619.98
+
+2017-08-27 * Twin Brooks Golf Course - Pro Shop handles package delivery for Resort and Conference Center
+    ; Payment: Meeting Card - September
+    Expense:Courier/Shipping                       $69.06 ; receiving packages for flock
+    Flock:Supplies
+
+2017-08-27 * Twin Brooks Golf Course - Pro Shop handles package delivery for Resort and Conference Center
+    ; Payment: Meeting Card - September
+    Expense:Courier/Shipping                       $25.50 ; receiving packages for flock
+    Flock:Supplies
+
+2017-08-31 * All Media Production
+    ; Payment: Meeting Card - jmadriaga - September
+    Expense:Outside Services/Training         $1500 ; deposit
+    Flock:Photographer                       -$1500 ; deposit
+
+2017-09-01 * Twin Brooks Golf Course - Pro Shop handles package delivery for Resort and Conference Center
+    ; Payment: Meeting Card - September
+    Expense:Courier/Shipping                       $8.50 ; Sending Laptops back to RH IT
+    Flock:Supplies
+
+2017-09-02 * sched.org
+    ; Payment: IE2588848
+    Expense:Outside Services/Training           $25
+    Flock:Schedule                             -$25
+
+2017-09-14 * Nick Bebout - ham radio exam costs
+    ; Payment: Meeting Card - September
+    Expense:Other                               $46.65
+    Flock:Supplies
+
+2017-09-05 * Bon Me (Catering for Evening Activity)
+    ; Payment: Meeting Card - jmadriaga - September
+    Expense:Meals                             $1523.13 ; Includes a discount because they were late
+    Flock:Food                               -$1523.13
+
+2017-09-06 * Bayside Tents
+    ; Payment: Meeting Card - jmcginni - September
+    Expense:Trade Show                      $1471
+    Flock:Activities                       -$1471
+
+2017-11-08 * Resort and Conference Center At Hyannis
+    ; Payment: PO reg 31343
+    Expense:Lodging                         $15449.39
+    Expense:Lodging:Deposit                -$13200 ; shift deposit to lodging
+    Expense:Lodging                        -$1242.16 ; room nights rebate
+    Flock:Funding:Lodging                  -$1007.23
+    Expense:Internet                        $300
+    Flock:Bandwidth                        -$300
+    Expense:Meals                           $1011.16 ; Coffee
+    Flock:Food:Sponsored Food              -$1011.16
+    Expense:Meals                           $3050.99 ; lunch
+    Flock:Food                             -$3050.99
+    Expense:Meals                           $736.08 ; Tuesday Night Pizza
+    Flock:Food                             -$736.08
+    Expense:Meals                           $1819.34 ; Tuesday Night Social
+    Flock:Food:Sponsored Food              -$1819.34
+    Expense:Trade Show                      $2390.63
+    Flock:AV                               -$2390.63
+    Expense:Trade Show                      $1185.75
+    Flock:AV                               -$1185.75
+    Expense:Meals                           $764.10 ; Coffee
+    Flock:Food:Sponsored Food              -$764.10
+    Expense:Meals                           $3050.99 ; lunch
+    Flock:Food                             -$3050.99
+    Expense:Trade Show                      $2390.63
+    Flock:AV                               -$2390.63
+    Expense:Trade Show                      $1185.75
+    Flock:AV                               -$1185.75
+    Expense:Meals                           $802.31 ; Coffee
+    Flock:Food:Sponsored Food              -$802.31
+    Expense:Meals                           $3050.99 ; lunch
+    Flock:Food                             -$3050.99
+    Expense:Trade Show                      $1195.95
+    Flock:AV                               -$1195.95
+    Expense:Trade Show                      $612.00
+    Flock:AV                               -$612.00
+    Expense:Meals                           $229.23 ; Coffee
+    Flock:Food:Sponsored Food              -$229.23
+    Expense:Trade Show                      $541.88
+    Flock:AV                               -$541.88
+
+2017-09-22 * All Media Production
+    ; Payment: Meeting Card - jmadriaga - September
+    Expense:Outside Services/Training         $1187.50 ; final payment
+    Flock:Photographer                      
+
+2017-09-25 * Amita Sharma Visa
+    ; Payment: IE2610191
+    Expense:Transportation                  $71.12
+    Flock:Funding:Other
+
+2017-09-26 * Azizaj Visa
+    ; Payment: IE2598244
+    Expense:Transportation                  $179.33 ; 3966.39
+    Flock:Funding:Other
+
+2017-09-27 * Kanika Muraka Bus
+    ; Payment: IE2610191
+    Expense:Transportation                  $71.18
+    Flock:Funding:Other
+
+2017-09-27 * Pravin Satpute
+    ; Payment: IE2610191
+    Expense:Transportation                  $41.90
+    Flock:Funding:Other
+
+2017-10-19 * Justin Flory
+    ; Payment: Meeting Card - October
+    Expense:Transportation                  $91.25
+    Flock:Funding:Other
+
+2017-11-04 * Aneta Petrova and Robert Kratky
+    ; Payment: IE2628228
+    Expense:Transportation                  $212.51 ; airfare
+    Expense:Transportation                  $111.59 ; lodging @ BOS
+    Expense:Transportation                  $84 ; bus/ferry
+    Expense:Transportation                  $388.15 ; lodging @ Flock
+    Flock:Funding:Travel                   -$796.25
+
+2017-11-04 * ADA funding
+    ; Payment: IE2628228
+    Expense:Transportation                  $1569.52 ; airfare
+    Expense:Transportation                  $84 ; bus/ferry
+    Expense:Transportation                  $111.59 ; lodging @ BOS
+    Expense:Transportation                  $388.15 ; lodging @ Flock
+    Flock:Funding:Other                    -$2153.26
+
+2018-02-07 * Copay Corrections
+    ; Payment: IE2751874 - bex CC February
+    ; Ticket: https://pagure.io/fedora-budget/issue/44
+    ; Ticket: https://pagure.io/fedora-budget/issue/45
+    External:Flock:Copays                      $202 ; Paypal
+    Flock:Paypal Fees                          $8.31
+    Budget:Flock:Copays                       -$210.31 ; Copays
diff --git a/FY18/ledger/latam.ldg b/FY18/ledger/latam.ldg
index 6b07c01..4533dc3 100644
--- a/FY18/ledger/latam.ldg
+++ b/FY18/ledger/latam.ldg
@@ -1,10 +1,14 @@
 ~ every 2 years
     ; Budget
-    LATAM:Unallocated     $4300
-    LATAM:Q1             -$2200
-    LATAM:Q2             -$1100
-    LATAM:Q3             -$0
-    LATAM:Q4             -$0
+    LATAM:Unallocated                    $4300
+    LATAM:Unallocated                    $10000 ; increase from https://pagure.io/Fedora-Council/tickets/issue/175
+    LATAM:Q1                            -$2200
+    LATAM:Q1                            -$214.78 ; overspend
+    LATAM:Q2                            -$1100
+    LATAM:Q2                             $699.18 ; underspend sweep
+    LATAM:Q3                            -$1000
+    LATAM:Q3                             $427.58 ; underspend sweep
+    LATAM:Q4                            -$10000
     LATAM:Unallocated
 
 ~ every 2 years
@@ -33,16 +37,32 @@
 
 ~ every 2 years
     ; Budget
-    LATAM:Q3                                             $0
-    LATAM:Q3:Software Freedom Day                       -$0
-    LATAM:Q3:Linux Day                                  -$0
-    LATAM:Q3:Latinoware                                 -$0
+    LATAM:Q3                                             $1000
+    LATAM:Q3:Software Freedom Day                       -$200
+    LATAM:Q3:Linux Day                                  -$100
+    LATAM:Q3:Latinoware                                 -$1500
     LATAM:Q3:DevConf Panama                             -$0 ; Event Cancelled
-    LATAM:Q3:PampaSeg                                   -$0
+    LATAM:Q3:PampaSec                                   -$250
+    LATAM:Q3:FTSL                                       -$100
+    LATAM:Q3:CIIS                                       -$500
+    LATAM:Q3:Fedora Women Day - Puno                    -$80
+    LATAM:Q3:Fedora Women Day - Cusco                   -$114
+    LATAM:Q3:Python Meetup Vol. VII                     -$125
+    LATAM:Q3:Docker Meetup                              -$125
+    LATAM:Q3:PyCon Argentina                            -$100
+    LATAM:Q3:FAD Argentina                              -$80
+    LATAM:Q3:HackMitin                                  -$250
+    LATAM:Q3:Peru Rumbo                                 -$200 ; https://pagure.io/ambassadors-latam/tasks/issue/434
     LATAM:Q3
 
+~ every 2 years
+    ; Budget
+    LATAM:Q4                                             $10000
+    LATAM:Q4:Swag                                       -$10000
+    LATAM:Q4
+
 2017-03-23 * Fedora Ambassador Card (March: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - March
     ; Linux Playa - 373 - yulytas - Peru
     Expense:Meals                          $85.00
     Expense:Meals:Bank                      $2.68
@@ -60,27 +80,27 @@
     LATAM:Q1:LinuxPlaya                  -$605.24
 
 2017-04-02 * Fedora Ambassador Card (April: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - April
 	; Cs50xni - Nicaragua - mayorga - 382
     Expense:Meals              $165.12
     Expense:Meals:Paypal         $9.21
     LATAM:Q1:Cs50xni          -$174.33
 
 2017-04-05 * Fedora Ambassador Card (April: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - April
 	; Flisol - Nicaragua - kathytanai - 389
 	; Flisol - Nicaragua - mayorga - 392
     Expense:Transportation:Air         $340.42
     LATAM:Q1:Flisol                    -$340.42
 
 2017-04-10 * Fedora Ambassador Card (April: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - April
 	; Flisol - Nicaragua - lkf - 395
     Expense:Transportation:Air         $154.80
     LATAM:Q1:Flisol                    -$154.80
 
 2017-04-13 * Fedora Ambassadors Card (April: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - April
     ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/391
 	; Flisol - Brazil - wolnei - 391
     Expense:Other Marketing Costs        $46.00
@@ -88,7 +108,7 @@
     LATAM:Q1:InstallFest            -$50.00
 
 2017-04-17 * Fedora Ambassadors Card (April: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - April
 	; Install Fest - Peru - yulitas - 385
     Expense:Other Marketing Costs           $233.42
     Expense:Other Marketing Costs:Bank      $17.00
@@ -96,26 +116,124 @@
     LATAM:Q1:InstallFest            -$263.95
 
 2017-04-17 * Fedora Ambassador Card (April: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - April
 	; Flisol - Venezuela - echevemaster - 393
     Expense:Transportation:Air          $119.92
     LATAM:Q1:Flisol                    -$119.92
 
 2017-04-17 * Fedora Ambassador Card (April: Cross
-    ; Payment: CC-LATAM
+    ; Payment: LATAM CC - April
 	; Flisol - Venezuela - jmlaya - 394
     Expense:Transportation:Air          $119.92
     LATAM:Q1:Flisol                    -$119.92
 
-2017-08-09   Fred Lima - Stickers
-    ; Payment: bex meeting card
+2017-08-09 * Fred Lima - Stickers
+    ; Payment: Meeting Card - August
 	; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/422
     Expense:Trade Show                  $19.13
     LATAM:Q1:Flisol                    -$19.13
 
-2017-08-14   Chino/Neville - Swag
-    ; Payment: bex meeting card
+2017-08-14 * Chino/Neville - Swag
+    ; Payment: Meeting Card - August
 	; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/398
     Expense:Trade Show                  $135.00
     Expense:Trade Show:Paypal Fee       $5.57
     LATAM:Q1:Flisol                    -$140.57
+
+2017-08-21 * Neville
+    ; Payment: Meeting Card - August
+	; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/388
+    Expense:Lodging                     $124.55
+    LATAM:Q1:Flisol                    -$124.55
+
+2017-08-22 * Alyaj2a
+    ; Payment: IE258848
+	; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/397
+    Expense:Printing/Reproduction       $111.96 ; 95.17 EUR - 350 PEN
+    LATAM:Q1:Flisol                    -$111.96
+
+2017-09-14 * Julita Airfare
+    ; Payment: IE2598228
+    ; Ticket https://pagure.io/ambassadors-latam/tasks/issue/417
+    Expense:Transportation               $205.37
+    LATAM:Q2:CONECIT                   -$205.37
+
+2017-09-19 * Chino
+    ; Payment: Meeting Card - September
+    ; Ticket https://pagure.io/ambassadors-latam/tasks/issue/405
+    Expense:Transportation               $39.03
+    Expense:Transportation:Paypal        $3.99
+    LATAM:Q1:SASO Conf                  -$43.02
+
+~ every 2 years
+    ; Originally paid on 2017-01-18 in FY17
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/372
+    Budget:LATAM DevConf Panama Refund      $1433.70 ; includes $66.30 in paypal fees
+    LATAM:Unallocated
+
+2017-09-28 * Refund of Devconf Panama Sponsorship - event Cancelled
+    ; Originally paid on 2017-01-18 in FY17
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/372
+    ; Payment: Inbound Transfer - Paypal - DevConf Panama Refund
+    Budget:LATAM DevConf Panama Refund      $1433.70 ; includes $66.30 in paypal fees
+    External:LATAM DevConf Panam Refund    -$1433.70
+
+2017-10-18 * Wolnei - Gasoline
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/429
+    ; Payment: Meeting Card - October
+    Expense:Fuel                         $53.39 ; 169.08 BRL
+    LATAM:Q3:FTSL                       -$53.39
+
+2017-10-18 * Mayorga visa
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/388
+    ; Payment: Meeting Card - October
+    Expense:Transportation               $167.63
+    LATAM:Q2:Flock					    -$167.63
+
+2017-10-19 * Wolnei - Latinoware Swag
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/425
+    ; Payment: Meeting Card - October
+    Expense:Trade Show                   $113.11 ; 360 BRL
+    LATAM:Q3:Latinoware                 -$113.11
+
+2017-11-03 * Neville Cross
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/420
+    ; Payment: Meeting Card - November
+    Expense:Meals                        $27.82
+    LATAM:Q2:Zamora Teran			    -$27.82
+
+2017-11-03 * Jose Reyes
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/430
+    ; Payment: Meeting Card - November
+    Expense:Meals                        $203.21
+    LATAM:Q3:Software Freedom Day       -$203.21
+
+2017-11-03 * alexove - FWD Cusco
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/426
+    ; Payment: IE2651395
+    Expense:Meals                                        $64.75
+    LATAM:Q3:Fedora Women Day - Cusco                   -$64.75
+
+2017-12-19 * Julita
+   ; Payment: IE2680598 - bex CC
+   ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/434
+   Expense:Meals                                         $105.96
+   LATAM:Q3:Peru Rumbo                                  -$105.96
+
+2017-12-21 * Athos
+   ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/436
+   ; Payment: IE2680588 - bex CC
+   Expense:Trade Show                    $9.34 ; 27 BRL
+   Expense:Transportation:Bus            $22.66 ; 65.53 BRL
+   LATAM:Q3:Linux Day                   -$32.00
+
+2018-02-14 * Lanyard Depot
+   ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/406
+   ; Payment: IE2751874 - bex CC February
+   Expense:Trade Show                   $2625 ; lanyards
+   LATAM:Q4:Swag                       -$2625
+
+2018-03-13 * Swag Production
+    ; Payment: Direct Invoice
+    Expense:Tradeshow                            $643.69 ; 525 EUR Fedora Win Key Caps
+    EMEA:Q4:Swag Production                     -$643.69
diff --git a/FY18/ledger/mindshare.ldg b/FY18/ledger/mindshare.ldg
new file mode 100644
index 0000000..44f9658
--- /dev/null
+++ b/FY18/ledger/mindshare.ldg
@@ -0,0 +1,43 @@
+~ every 2 years
+    ; Budget
+    Mindshare:Unallocated                $9000
+    Mindshare:FAD                       -$9000
+    Mindshare:Unallocated
+
+2018-02-13 * Vueling
+    ; Payment: IE2751900 - bex CC February
+    ; Transfers from Docs FAD
+    Expense:Airfare                      $726.95 ; 587.92 EUR
+    Mindshare:FAD                       -$726.95
+
+2018-02-14 * Flight - Bebout
+    ; Payment: PCard - February
+    Expense:Airfare                      $1950.31
+    Mindshare:FAD                       -$1950.31
+
+2018-02-14 * Flight - Flory
+    ; Payment: PCard - February
+    Expense:Airfare                      $1656.91
+    Mindshare:FAD                       -$1656.91
+
+2018-02-16 * Flight - Lucnea
+    ; Payment: PCard - February
+    Expense:Airfare                      $1303.16
+    Mindshare:FAD                       -$1303.16
+
+2018-02-16 * Vueling
+    ; Payment: IE2751900 - bex CC February
+    ; Transfer from Docs FAD
+    Expense:Airfare                      $195.94 ; 156.98 EUR
+    Mindshare:FAD                       -$195.94
+
+2018-02-21 * Hotel for Mindshare FAD
+    ; Payment: IE2802515 - bex
+    Expense:Lodging    $2626.1 ; 2133.6 EUR
+    Mindshare:FAD   -$2626.1
+
+2018-02-26 * Vueling
+    ; Payment: bex Pcard - February
+    ; Transfer from Docs FAD
+    Expense:Airfare                      $203.57
+    Mindshare:FAD                       -$203.57
diff --git a/FY18/ledger/na.ldg b/FY18/ledger/na.ldg
index f6d8af7..31c9b6e 100644
--- a/FY18/ledger/na.ldg
+++ b/FY18/ledger/na.ldg
@@ -2,9 +2,12 @@
     ; Budget
     NA:Unallocated                                    $13250
     NA:Q1                                            -$9000
+    NA:Q1                                             $4661.24 ; under spend sweep
     NA:Q2                                            -$1750
+    NA:Q2                                            -$496.37 ; under spend sweep
     NA:Q3                                            -$2900 ; increased for FossCon because of Q1 underspend
-    NA:Q4                                            -$0
+    NA:Q3                                            -$596.96 ; under spend sweep
+    NA:Q4                                            -$2500
     NA:Unallocated
 
 ~ every 2 years
@@ -14,75 +17,200 @@
     NA:Q1:LFNW                                       -$2500 ; https://pagure.io/ambassadors-na/tasks/issue/167
     NA:Q1:Bitcamp                                    -$1500 ; https://pagure.io/ambassadors-na/tasks/issue/157
     NA:Q1:SELF                                       -$2500 ; https://pagure.io/ambassadors-na/tasks/issue/171
-    NA:Q1                                             $4661.24 ; sweep
     NA:Unallocated
 
 ~ every 2 years
     ; Budget
     NA:Q2                                             $1750
     NA:Q2:Fosscon                                    -$400  ; https://pagure.io/ambassadors-na/tasks/issue/183
-    NA:Q2:Hackmit2017                                -$1750  ; https://pagure.io/ambassadors-na/tasks/issue/184
+    NA:Q2:HackMIT2017                                -$1750  ; https://pagure.io/ambassadors-na/tasks/issue/184
     NA:Q2
 
 ~ every 2 years
     ; Budget
     NA:Q3                                             $2500
     NA:Q3:Ohio Linux Fest                            -$2500 ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    NA:Q3:FOSSCON                                    -$0
+    NA:Q3:Various                                    -$0
+    NA:Q3:Lisa2017                                   -$0
     NA:Q3
 
-2017-07-20  Self Material and Fuel expense
-    ; Payment: award CC
-    Expense:Other                        $134.77 ; to be split
-    NA:Q2:Self                          -$134.77
+~ every 2 years
+    ; Budget
+    NA:Q4                                             $2500
+    NA:Q4:SCALE                                      -$2500 ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/191
+    NA:Q4                                            -$0
+
+2018-01-04 * Rick Elrod Lodging reimbursement
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/443
+    ; Payment: NA CC - January 2018
+    Expense:Lodging                      $278.84 ;
+    NA:Q3:Lisa2017                      -$278.84
+
+2018-01-04 * Rick Elrod Transportation reimbursement
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/443
+    ; Payment: NA CC - January 2018
+    Expense:Transportation               $75.23 ;
+    Expense:Transportation:Paypal        $10.57 ;
+    NA:Q3:Lisa2017                      -$85.80
+
+2018-01-04 * Beth Lynn Eicher Lodging reimbursement
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/445
+    ; Payment: NA CC - January 2018
+    Expense:Lodging                      $70.70 ;
+    NA:Q3:Lisa2017                      -$70.70
+
+2018-01-04 * Beth Lynn Eicher Transportation reimbursement
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/445
+    ; Payment: NA CC - January 2018
+    Expense:Transportation               $123.57 ;
+    NA:Q3:Lisa2017                      -$123.57
+
+2017-10-15 * Justin Flory Transportation reimbursement
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/446
+    ; Payment: NA CC - December
+    Expense:Transportation               $133.28 ;
+    NA:Q3:Hackmit2017                   -$133.28
+
+2017-11-30 * Shipping
+    ; Ticket: Various
+    ; Payment: NA CC - December 2017
+    Expense:Shipping                     $9.70 ; 
+    NA:Q3:Various                       -$9.70
+    
+2017-11-06 * Shipping
+    ; Ticket: Various
+    ; Payment: NA CC
+    Expense:Shipping                     $25.81 ; 
+    NA:Q3:Various                       -$25.81
+    
+2017-10-27 * Shipping
+    ; Ticket: Various
+    ; Payment: NA CC
+    Expense:Shipping                     $231.29 ; 
+    NA:Q3:Various                       -$231.29
+
+2017-10-22 * Travel
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/443
+    ; Payment: NA CC - October
+    Expense:Transportation                      $343.56 ; Ricky Elrod
+    NA:Q3:LISA2017                       -$343.56
+
+2017-10-15 * Ben Williams Transportation
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - October
+    Expense:Transportation               $64.11
+    NA:Q3:OLF                           -$64.11
+
+2017-10-01 * Lodging
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - October
+    Expense:Lodging                      $595.14 ; Ward
+    NA:Q3:OLF                           -$595.14
+
+2017-10-02 * Lodging
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - October
+    Expense:Lodging                      $396.76 ; Williams
+    NA:Q3:OLF                           -$396.76
+
+2017-10-01 * Travel
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - October
+    Expense:Fuel                          $42.55
+    NA:Q3:OLF                            -$42.55
+
+2017-10-01 * Travel
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - October
+    Expense:Fuel                          $48
+    NA:Q3:OLF                            -$48
+
+2017-09-23 * Travel
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - September
+    Expense:Fuel                          $41.02
+    NA:Q3:OLF                            -$41.02
+
+2017-09-22 * Travel
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - September
+    Expense:Fuel                         $36
+    NA:Q3:OLF                           -$36
+
+2017-09-18 * Reimbursement for Mike DePaulo
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/439
+    ; Payment: NA CC - September
+    Expense:Trade Show                    $55.87 
+    NA:Q3:FOSSCON                        -$55.87 
+
+2017-09-06 * UPS shipping bill
+    ; Ticket: Various
+    ; Payment: NA CC - September
+    Expense:Shipping                     $164.96 
+    NA:Q3:Various                       -$164.96 
+
+2017-08-23 * Ohio Liniux Fest sponsor payment
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179
+    ; Payment: NA CC - August
+    Expense:Trade Show                   $750.00 
+    NA:Q3:OLF                           -$750.00 
+
+2017-07-20 * Self Material and Fuel expense vaioof
+    ; Payment: NA CC - July
+    Expense:Other Marketing Costs               $111.58 ; DVDs and Sign Holders
+    Expense:Fuel                                $19.00
+    Expense:Other Marketing Costs:Paypal        $4.19
+    NA:Q2:Self                                 -$134.77
 
 2017-06-23 * UPS
-    ; Payment: award CC
+    ; Payment: NA CC - June
     Expense:Courier/Shipping             $59.11
     NA:Q2:Bitcamp                      -$59.11
 
 2017-06-23 * Self Travel Expense
-    ; Payment: award CC
+    ; Payment: NA CC - June
     Expense:Fuel                         $25.60 ; Ward
     Expense:Fuel                         $26.27 ; Ward
     NA:Q2:Self                         -$51.87
 
 2017-06-11 * Lodging
-    ; Payment: award CC
+    ; Payment: NA CC - June
     Expense:Lodging                      $352.68 ; Ward
     Expense:Lodging                      $352.68 ; Williams
     NA:Q2:SELF                         -$705.36
 
 2017-05-18 * UPS
-    ; Payment: award CC
+    ; Payment: NA CC - May
     Expense:Courier/Shipping             $131.43
     NA:Q1:LFNW                          -$65.72
     NA:Q1:Bitcamp                       -$65.71
     
 2017-04-20 * Bitcamp Travel expense
-    ; Payment: award CC
+    ; Payment: NA CC - April
     Expense:Fuel                         $22.59; Mike Depaulo
     NA:Q1:Bitcamp                       -$22.59
     
 2017-04-20 * UPS
-    ; Payment: award CC
+    ; Payment: NA CC - April
     Expense:Courier/Shipping             $46.79
     NA:Q1:Bitcamp                       -$46.79
     
 2017-03-15 * LinuxFest NorthWest Booth Fee
     ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/167
-    ; Payment: RH Meeting Card - jmadriaga
+    ; Payment: Meeting Card - jmadriaga - March
     Expense:Trade Show                   $1500
     NA:Q1:LFNW                          -$1500
 
 2017-03-15 * Bitcamp Sponsorship
     ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/170
-    ; Payment: RH Meeting Card - jmadriaga
+    ; Payment: Meeting Card - jmadriaga - March
     Expense:Trade Show                   $999.99
     NA:Q1:Bitcamp                       -$999.99
 
 2017-03-23 * SCaLE15x reimbursement - lajuggler
     ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/170
-    ; Payment: bex CC - IE2241981
+    ; Payment: IE2241981
     Expense:Lodging                      $589.04
     Expense:Parking/Tolls                $54.00
     Expense:Fuel                         $7.00
@@ -91,19 +219,36 @@
 
 2017-03-25 * SCaLE15x reimbursement - aacosta
     ; Ticket: https://pagure.io/ambassadors-na/requests/issue/436
-    ; Payment: bex CC - IE2241981
+    ; Payment: IE2241981
     Expense:Transportation               $371.07
     Expense:Finance Charges              $17.12
     NA:Q1:SCaLE15x                      -$388.19
 
 2017-03-06 * UPS
-    ; Payment: jrose CC
+    ; Payment: NA CC - March - jrose
     Expense:Courier/Shipping             $74.08
     NA:Q1:Bitcamp                       -$74.08
 
 2017-04-10 * SouthEast LinuxFest
     ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/171
-    ; Payment: IE2345916 - bex CC
+    ; Payment: IE2345916
     Expense:Trade Show                   $500
     NA:Q1:SELF                          -$500
 
+2017-08-10 * FOSSCON
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/181
+    ; Payment: Meeting Card - August
+    Expense:Trade Show                   $250 ; booth fee
+    NA:Q2:Fosscon                       -$250
+
+2017-09-10 * Hotels.com
+    ; Payment: Meeting Card - September
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/184
+    Expense:Lodging                     $295.26 ; jflory mikedep
+    NA:Q2:HackMIT2017                  -$295.26
+
+2018-01-11 * HackMIT Sponsorship
+    ; Payment: IE2689100 - bex Cash
+    ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/184
+    Expense:Trade Show                  $750
+    NA:Q2:HackMIT2017                  -$750
diff --git a/FY18/ledger/summer-coding.ldg b/FY18/ledger/summer-coding.ldg
index fd1ca0e..0f50617 100644
--- a/FY18/ledger/summer-coding.ldg
+++ b/FY18/ledger/summer-coding.ldg
@@ -1,26 +1,40 @@
 ~ every 2 years
-    ; Budget
-    Summer Coding:LDAP:Travel       -$290 ; ~230 EUR
-    Summer Coding:LDAP:Lodging      -$270 ; ~230 EUR
-    Summer Coding:LDAP:Conference   -$140 ; ~120 EUR
-    Summer Coding:Flock             -$1500 ; David Silva
-    Summer Coding:Flock             -$1300 ; David Labsky
+    ; GSoC Budget
+        ;Travel Stipend            $500
+        ;Mentor Summit             $2200 ; 2 * $1100
+        ;Other Funding             $3000 ; 6 * $500
+    Budget:GSoC                    $5700
+    Summer Coding:LDAP Conference   -$950 ; ~580 EUR original proposal
+    Summer Coding:Mentor Summit     -$2400
     Summer Coding:Unallocated
 
-2017-08-01   Google Summer of Code Support (date is approximate)
-    Summer Coding:Unallocated         $8200
-            ;Travel Stipend            $3000 ; 6 * $500
-            ;Mentor Summit             $2200 ; 2 * $1100
-            ;Other Funding             $3000 ; 6 * $500
-    External
+2017-09-13 * GSoC Payment 1
+    ; Payment: Inbound - GSoC Payment 1
+    Budget:GSoC                    $5700
+    External:GSoC                 -$5700
 
 2017-08-09 * LDAPCon Ticket for Ilias Stamatis
-    ; Payment: bex CC - IE2563459
+    ; Payment: IE2563459
     Expense:Trade Show                 $140.85 ; 120 EUR
-    Summer Coding:LDAP:Conference     -$140.85
+    Summer Coding:LDAP Conference     -$140.85
 
-2017-08-10   LDAPCon Flight for Ilias Stamatis
-    ; Payment: bex Meeting Card
+2017-08-10 * LDAPCon Flight for Ilias Stamatis
+    ; Payment: Meeting Card - August
     Expense:Transportation             $289.70
     Expense:Transportation:Agent Fee   $38.00
-    Summer Coding:LDAP:Travel         -$327.70
+    Summer Coding:LDAP Conference     -$327.70
+
+2017-09-09 * Sachin Kamath
+    ; Payment: Meeting Card - September
+    Expense:Transportation             $1231.96 ; mentor summit airfare
+    Summer Coding:Mentor Summit       -$1231.96
+
+2017-09-12 * Martin Briza
+    ; Payment: Meeting Card - September
+    Expense:Transportation             $1119.76 ; mentor summit airfare
+    Summer Coding:Mentor Summit       -$1119.76
+
+2017-09-01 * LDAPCon Hotel for Ilias Stamatis
+    ; Payment: William Brown Expense Report
+    Expense:Trade Show                 $434.03 ; 369.27 EUR
+    Summer Coding:LDAP Conference     -$434.03
diff --git a/FY18/ledger/temporary-budget.note.txt b/FY18/ledger/temporary-budget.note.txt
new file mode 100644
index 0000000..79be57f
--- /dev/null
+++ b/FY18/ledger/temporary-budget.note.txt
@@ -0,0 +1,45 @@
+Brian Exelbierd Mar 1 (6 days ago)Pin to ambassadorsShow detailsSentMark as UnreadReply to All More
+From:
+Brian Exelbierd <bex@pobox.com>
+To:
+ambassadors@lists.fedoraproject.org
+Subject:
+Budget Update
+Date:
+Wednesday, March 01, 2017 6:38 PM
+Size:
+2 KB
+Today the Council met and voted on a budget issue that affects
+Ambassadors:
+
+The FY18 (2017-2018) budget provided by RH will not be available by
+March 1, 2017.  Therefore the council has authorized a temporary
+spending authorization for Ambassador regions in today's meeting.
+
+Regions are authorized to allocate/spend up to 10% of their prior year
+budget.  This should carry us through to the final budget allocation
+which is coming.  This IS NOT A BUDGET CUT.  This is just a way to allow
+regions to keep doing their work while also protecting us from the
+unknown.  See details below please.
+
+Explanation/Discussion:
+
+Because we do not have final budget numbers, we need to be conservative
+with spending.  Therefore Ambassador regions are authorized to allocate
+and potentially spend up to 10% of their prior year budget.  This is NOT
+A FINAL BUDGET nor do we expect to have severe budget cuts, but we need
+to be fiscally responsible.  If a region needs to spend more than this
+amount, they should vote on the ticket assuming they will receive 90% of
+their prior year budget and make a request to the Council in a ticket.
+
+To put this in context, 10% of the prior year budget should cover the
+period from March 1 to about April 10 (assuming level spending).  For
+some regions this may go further depending on the actual timing of
+events.  The 90% level proposed above assuming some cutting and allows
+for regions to make a decision based on a reasonably conservative
+estimate of their total budget.  While changes are possible, we are not
+expecting the public budget to be reduced but have been given no
+official guidance on this.  Additionally, this estimates reasonably
+conservative reductions to account for some budgetary realignment the
+Council may choose to do.
+
diff --git a/FY18/ledger/temporary-budget.txt b/FY18/ledger/temporary-budget.txt
deleted file mode 100644
index 79be57f..0000000
--- a/FY18/ledger/temporary-budget.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Brian Exelbierd Mar 1 (6 days ago)Pin to ambassadorsShow detailsSentMark as UnreadReply to All More
-From:
-Brian Exelbierd <bex@pobox.com>
-To:
-ambassadors@lists.fedoraproject.org
-Subject:
-Budget Update
-Date:
-Wednesday, March 01, 2017 6:38 PM
-Size:
-2 KB
-Today the Council met and voted on a budget issue that affects
-Ambassadors:
-
-The FY18 (2017-2018) budget provided by RH will not be available by
-March 1, 2017.  Therefore the council has authorized a temporary
-spending authorization for Ambassador regions in today's meeting.
-
-Regions are authorized to allocate/spend up to 10% of their prior year
-budget.  This should carry us through to the final budget allocation
-which is coming.  This IS NOT A BUDGET CUT.  This is just a way to allow
-regions to keep doing their work while also protecting us from the
-unknown.  See details below please.
-
-Explanation/Discussion:
-
-Because we do not have final budget numbers, we need to be conservative
-with spending.  Therefore Ambassador regions are authorized to allocate
-and potentially spend up to 10% of their prior year budget.  This is NOT
-A FINAL BUDGET nor do we expect to have severe budget cuts, but we need
-to be fiscally responsible.  If a region needs to spend more than this
-amount, they should vote on the ticket assuming they will receive 90% of
-their prior year budget and make a request to the Council in a ticket.
-
-To put this in context, 10% of the prior year budget should cover the
-period from March 1 to about April 10 (assuming level spending).  For
-some regions this may go further depending on the actual timing of
-events.  The 90% level proposed above assuming some cutting and allows
-for regions to make a decision based on a reasonably conservative
-estimate of their total budget.  While changes are possible, we are not
-expecting the public budget to be reduced but have been given no
-official guidance on this.  Additionally, this estimates reasonably
-conservative reductions to account for some budgetary realignment the
-Council may choose to do.
-
diff --git a/FY18/ledger/validator.ledger b/FY18/ledger/validator.ledger
deleted file mode 100644
index f9d3278..0000000
--- a/FY18/ledger/validator.ledger
+++ /dev/null
@@ -1,36 +0,0 @@
-account APAC
-account EMEA
-account LATAM
-account NA
-account FUDCon LATAM
-account FUDCon APAC
-account Flock
-account FADs
-account D&I
-account Equity:Red Hat
-
-commodity $
-
-account Expense:Transportation
-account Expense:Mileage
-account Expense:Fuel
-account Expense:Car Rental
-account Expense:Parking/Tolls
-account Expense:Taxi/Limo
-account Expense:Lodging 
-account Expense:Meals
-account Expense:Business Meeting
-account Expense:Courier/Shipping 
-account Expense:Office Supplies
-account Expense:Dues/Subscriptions/Books
-account Expense:Mobile Phone
-account Expense:Internet
-account Expense:Late Fees
-account Expense:Finance Charges
-account Expense:Trade Show
-account Expense:Outside Services/Training
-account Expense:Employee Relations (flowers)
-account Expense:Contributions/Donations 
-account Expense:Other Marketing Costs
-account Expense:On-line Advertising
-account Expense:Printing/Reproduction
diff --git a/FY18/mindshare.adoc b/FY18/mindshare.adoc
index a015b36..e9ffcf5 100644
--- a/FY18/mindshare.adoc
+++ b/FY18/mindshare.adoc
@@ -5,7 +5,10 @@
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/mindshare.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY18/na.adoc b/FY18/na.adoc
index 9bcb3de..96d3a24 100644
--- a/FY18/na.adoc
+++ b/FY18/na.adoc
@@ -7,7 +7,7 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/na.csv[]
 |===
 
@@ -18,7 +18,7 @@ Q1 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/na-q1.csv[]
 |===
 
@@ -28,7 +28,7 @@ Q2 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/na-q2.csv[]
 |===
 
@@ -38,7 +38,7 @@ Q3 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/na-q3.csv[]
 |===
 
@@ -48,7 +48,10 @@ Q4 Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/na-q4.csv[]
 |===
 
+
+
+Built on: {localdatetime}
diff --git a/FY18/overall.adoc b/FY18/overall.adoc
index 44dbcfc..d160eb9 100644
--- a/FY18/overall.adoc
+++ b/FY18/overall.adoc
@@ -7,7 +7,20 @@ Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/overall.csv[]
 |===
 
+
+Source of Budget Report
+-----------------------
+
+[caption="", format="csv", separator="	", cols="1*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Source	Amount
+include::FY18/source.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY18/people.adoc b/FY18/people.adoc
index 511ff1c..3dee7b7 100644
--- a/FY18/people.adoc
+++ b/FY18/people.adoc
@@ -44,3 +44,6 @@
 // Other
 :FCAIC_name: Brian Exelbierd
 :FCAIC_email: bex@pobox.com
+
+
+Built on: {localdatetime}
diff --git a/FY18/summer-coding.adoc b/FY18/summer-coding.adoc
index aea22fd..a315698 100644
--- a/FY18/summer-coding.adoc
+++ b/FY18/summer-coding.adoc
@@ -7,6 +7,9 @@ Summer Coding Budget Report
 [caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
 .All amounts are in US Dollars
 |===
-Budget	Spent So Far	Remaining Budget	Percent Spent	Budget Category
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
 include::FY18/summer-coding.csv[]
 |===
+
+
+Built on: {localdatetime}
diff --git a/FY19/README.adoc b/FY19/README.adoc
new file mode 100644
index 0000000..9487d91
--- /dev/null
+++ b/FY19/README.adoc
@@ -0,0 +1,41 @@
+= FY19 Budget Data
+
+The 2018/2019 Fiscal Year runs from 1 March 2018 to 28 February 2018.
+
+**No budget has been authorized or set for this year.  These files are in draft!**
+
+== Personnel
+
+include::FY19/people.adoc[]
+
+During FY19, the following people are working on the budget team.
+
+=== APAC Region
+
+- Treasurer: mailto:{apac_treasurer_email}[{apac_treasurer_name}]
+- Logitistican: mailto:{apac_logistician_email}[{apac_logistician_name}]
+- Story Teller: mailto:{apac_storyteller_email}[{apac_storyteller_name}]
+- Card Holder: mailto:{apac_cc_email}[{apac_cc_name}]
+
+=== EMEA Region
+
+- Treasurer: mailto:{emea_treasurer_email}[{emea_treasurer_name}]
+- Logitistican: mailto:{emea_logistician_email}[{emea_logistician_name}]
+- Story Teller: mailto:{emea_storyteller_email}[{emea_storyteller_name}]
+- Card Holder: mailto:{emea_cc_email}[{emea_cc_name}]
+
+=== LATAM Region
+
+- Treasurer: mailto:{latam_treasurer_email}[{latam_treasurer_name}]
+- Logitistican: mailto:{latam_logistician_email}[{latam_logistician_name}]
+- Story Teller: mailto:{latam_storyteller_email}[{latam_storyteller_name}]
+- Card Holder: mailto:{latam_cc_email}[{latam_cc_name}]
+
+=== NA Region
+
+- Treasurer: mailto:{na_treasurer_email}[{na_treasurer_name}]
+- Logitistican: mailto:{na_logistician_email}[{na_logistician_name}]
+- Story Teller: mailto:{na_storyteller_email}[{na_storyteller_name}]
+- Card Holder: mailto:{na_cc_email}[{na_cc_name}]
+
+Built on: {localdatetime}
diff --git a/FY19/apac.adoc b/FY19/apac.adoc
new file mode 100644
index 0000000..75d2745
--- /dev/null
+++ b/FY19/apac.adoc
@@ -0,0 +1,57 @@
+Fedora Ambassadors - Asia Pacific Budget Report
+===============================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/apac.csv[]
+|===
+
+
+Q1 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/apac-q1.csv[]
+|===
+
+Q2 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/apac-q2.csv[]
+|===
+
+Q3 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/apac-q3.csv[]
+|===
+
+Q4 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/apac-q4.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY19/council.adoc b/FY19/council.adoc
new file mode 100644
index 0000000..45faf08
--- /dev/null
+++ b/FY19/council.adoc
@@ -0,0 +1,15 @@
+Fedora Council and Other Expenses
+=================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/council.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY19/d-i.adoc b/FY19/d-i.adoc
new file mode 100644
index 0000000..0147559
--- /dev/null
+++ b/FY19/d-i.adoc
@@ -0,0 +1,16 @@
+Fedora Diversity & Inclusion Budget Report
+==========================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/d-i.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY19/emea.adoc b/FY19/emea.adoc
new file mode 100644
index 0000000..9653429
--- /dev/null
+++ b/FY19/emea.adoc
@@ -0,0 +1,56 @@
+Fedora Ambassadors - Europe, Middle East and Africa Budget Report
+=================================================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/emea.csv[]
+|===
+
+Q1 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/emea-q1.csv[]
+|===
+
+Q2 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/emea-q2.csv[]
+|===
+
+Q3 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/emea-q3.csv[]
+|===
+
+Q4 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/emea-q4.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY19/events.adoc b/FY19/events.adoc
new file mode 100644
index 0000000..5508fb7
--- /dev/null
+++ b/FY19/events.adoc
@@ -0,0 +1,15 @@
+Fedora Events Budget Report
+===========================
+
+Flock Budget Report
+-------------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/flock.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY19/fads.adoc b/FY19/fads.adoc
new file mode 100644
index 0000000..4f6d17f
--- /dev/null
+++ b/FY19/fads.adoc
@@ -0,0 +1,15 @@
+Fedora FADs Budget Report
+=========================
+
+FADs Budget Report
+------------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/fads.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY19/gen_reports b/FY19/gen_reports
new file mode 100755
index 0000000..2f25143
--- /dev/null
+++ b/FY19/gen_reports
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Clean up reports
+rm *.csv
+
+# Overall Report for Fedora
+ledger -f ledger/fedora.ledger budget --depth 1 not '^Budget'| ../_builder/budget2tsv > overall.csv
+if [ ! -s overall.csv ]; then
+    ledger -f ledger/fedora.ledger budget --depth 1 | ../_builder/budget2tsv > overall.csv
+fi
+
+# Source of funds
+ledger -f ledger/fedora.ledger budget '^Budget' --flat | ../_builder/budget2tsv | cut -f1-2 > source.csv
+
+# Flock - doesn't do second levels so we need to just do the first level list and cut the first line
+ledger -f ledger/fedora.ledger budget '^Flock' --flat | tail -n +2 | ../_builder/budget2tsv > flock.csv
+
+# Summer Coding
+ledger -f ledger/fedora.ledger budget '^Summer Coding' --flat | tail -n +1 | ../_builder/budget2tsv > summer-coding.csv
+
+# FADs
+ledger -f ledger/fedora.ledger budget '^FADs' and not '^FADs$' --depth 2 --flat | ../_builder/budget2tsv > fads.csv
+if [ ! -s fads.csv ]; then
+    ledger -f ledger/fedora.ledger budget '^FADs' --flat | ../_builder/budget2tsv > fads.csv
+fi
+
+# Diversity & Inclusion - doesn't do second levels so we need to just do the first level list and cut the first line
+ledger -f ledger/fedora.ledger budget '^Diversity-Inclusion' --flat | tail -n +1 | ../_builder/budget2tsv > d-i.csv
+
+# Mindshare - doesn't do second levels so we need to just do the first level list and cut the first line
+ledger -f ledger/fedora.ledger budget '^Mindshare' --flat | tail -n +2 | ../_builder/budget2tsv > mindshare.csv
+
+# Council and Other Expenses
+ledger -f ledger/fedora.ledger budget '^Council' and not '^Council$' --flat | ../_builder/budget2tsv > council.csv
+if [ ! -s council.csv ]; then
+    ledger -f ledger/fedora.ledger budget '^Council' --flat | ../_builder/budget2tsv > council.csv
+fi
+
+# APAC
+ledger -f ledger/fedora.ledger budget '^APAC' and not '^APAC$' --flat --depth 2 | ../_builder/budget2tsv > apac.csv
+if [ ! -s apac.csv ]; then
+    ledger -f ledger/fedora.ledger budget '^APAC' --flat --depth 2 | ../_builder/budget2tsv > apac.csv
+fi
+ledger -f ledger/fedora.ledger budget '^APAC:Q1$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > apac-q1.csv
+ledger -f ledger/fedora.ledger budget '^APAC:Q1' --flat | tail -n +2 | ../_builder/budget2tsv >> apac-q1.csv
+ledger -f ledger/fedora.ledger budget '^APAC:Q2$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > apac-q2.csv
+ledger -f ledger/fedora.ledger budget '^APAC:Q2' --flat | tail -n +2 | ../_builder/budget2tsv >> apac-q2.csv
+ledger -f ledger/fedora.ledger budget '^APAC:Q3$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > apac-q3.csv
+ledger -f ledger/fedora.ledger budget '^APAC:Q3' --flat | tail -n +2 | ../_builder/budget2tsv >> apac-q3.csv
+ledger -f ledger/fedora.ledger budget '^APAC:Q4$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > apac-q4.csv
+ledger -f ledger/fedora.ledger budget '^APAC:Q4' --flat | tail -n +2 | ../_builder/budget2tsv >> apac-q4.csv
+
+# EMEA
+ledger -f ledger/fedora.ledger budget '^EMEA' and not '^EMEA$' --flat --depth 2 | ../_builder/budget2tsv > emea.csv
+if [ ! -s emea.csv ]; then
+    ledger -f ledger/fedora.ledger budget '^EMEA' --flat --depth 2 | ../_builder/budget2tsv > emea.csv
+fi
+ledger -f ledger/fedora.ledger budget '^EMEA:Q1$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > emea-q1.csv
+ledger -f ledger/fedora.ledger budget '^EMEA:Q1' --flat | tail -n +2 | ../_builder/budget2tsv >> emea-q1.csv
+ledger -f ledger/fedora.ledger budget '^EMEA:Q2$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > emea-q2.csv
+ledger -f ledger/fedora.ledger budget '^EMEA:Q2' --flat | tail -n +2 | ../_builder/budget2tsv >> emea-q2.csv
+ledger -f ledger/fedora.ledger budget '^EMEA:Q3$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > emea-q3.csv
+ledger -f ledger/fedora.ledger budget '^EMEA:Q3' --flat | tail -n +2 | ../_builder/budget2tsv >> emea-q3.csv
+ledger -f ledger/fedora.ledger budget '^EMEA:Q4$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > emea-q4.csv
+ledger -f ledger/fedora.ledger budget '^EMEA:Q4' --flat | tail -n +2 | ../_builder/budget2tsv >> emea-q4.csv
+
+# LATAM
+ledger -f ledger/fedora.ledger budget '^LATAM' and not '^LATAM$' --flat --depth 2 | ../_builder/budget2tsv > latam.csv
+if [ ! -s latam.csv ]; then
+    ledger -f ledger/fedora.ledger budget '^LATAM' --flat --depth 2 | ../_builder/budget2tsv > latam.csv
+fi
+ledger -f ledger/fedora.ledger budget '^LATAM:Q1$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > latam-q1.csv
+ledger -f ledger/fedora.ledger budget '^LATAM:Q1' --flat | tail -n +2 | ../_builder/budget2tsv >> latam-q1.csv
+ledger -f ledger/fedora.ledger budget '^LATAM:Q2$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > latam-q2.csv
+ledger -f ledger/fedora.ledger budget '^LATAM:Q2' --flat | tail -n +2 | ../_builder/budget2tsv >> latam-q2.csv
+ledger -f ledger/fedora.ledger budget '^LATAM:Q3$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > latam-q3.csv
+ledger -f ledger/fedora.ledger budget '^LATAM:Q3' --flat | tail -n +2 | ../_builder/budget2tsv >> latam-q3.csv
+ledger -f ledger/fedora.ledger budget '^LATAM:Q4$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > latam-q4.csv
+ledger -f ledger/fedora.ledger budget '^LATAM:Q4' --flat | tail -n +2 | ../_builder/budget2tsv >> latam-q4.csv
+
+# NA
+ledger -f ledger/fedora.ledger budget '^NA' and not '^NA$' --flat --depth 2 | ../_builder/budget2tsv > na.csv
+if [ ! -s na.csv ]; then
+    ledger -f ledger/fedora.ledger budget '^NA' --flat --depth 2 | ../_builder/budget2tsv > na.csv
+fi
+ledger -f ledger/fedora.ledger budget '^NA:Q1$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > na-q1.csv
+ledger -f ledger/fedora.ledger budget '^NA:Q1' --flat | tail -n +2 | ../_builder/budget2tsv >> na-q1.csv
+ledger -f ledger/fedora.ledger budget '^NA:Q2$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > na-q2.csv
+ledger -f ledger/fedora.ledger budget '^NA:Q2' --flat | tail -n +2 | ../_builder/budget2tsv >> na-q2.csv
+ledger -f ledger/fedora.ledger budget '^NA:Q3$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > na-q3.csv
+ledger -f ledger/fedora.ledger budget '^NA:Q3' --flat | tail -n +2 | ../_builder/budget2tsv >> na-q3.csv
+ledger -f ledger/fedora.ledger budget '^NA:Q4$' | ../_builder/budget2tsv  | cut -f1-4 | awk 'NF{print $0,"\tUnallocated" ;}' > na-q4.csv
+ledger -f ledger/fedora.ledger budget '^NA:Q4' --flat | tail -n +2 | ../_builder/budget2tsv >> na-q4.csv
diff --git a/FY19/latam.adoc b/FY19/latam.adoc
new file mode 100644
index 0000000..eb8900c
--- /dev/null
+++ b/FY19/latam.adoc
@@ -0,0 +1,57 @@
+Fedora Ambassadors - Latin and South America Budget Report
+==========================================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/latam.csv[]
+|===
+
+
+Q1 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/latam-q1.csv[]
+|===
+
+Q2 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/latam-q2.csv[]
+|===
+
+Q3 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/latam-q3.csv[]
+|===
+
+Q4 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/latam-q4.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY19/ledger/apac.ldg b/FY19/ledger/apac.ldg
new file mode 100644
index 0000000..fcd7538
--- /dev/null
+++ b/FY19/ledger/apac.ldg
@@ -0,0 +1,27 @@
+~ every 2 years
+    ; Budget
+    APAC:Unallocated      $0
+    APAC:FY18 Expenses   -$0
+    APAC:Q1              -$0
+    APAC:Q2              -$0
+    APAC:Q3              -$0
+    APAC:Q4              -$0
+    APAC:Unallocated
+
+~ every 2 years
+    ; Budget
+    APAC:Q1                                      $0
+    APAC:Q1:OSCAL                               -$500 ; https://pagure.io/ambassadors-apac/issue/294
+    APAC:Unallocated
+
+2017-03-13 * Swag for China
+    ; Payment: IE2804249 - bex CC
+    ; Ticket: https://pagure.io/ambassadors-apac/issue/277
+    Expense:Trade Show               $112.45 ; 665 CNY with xferwise fees
+    APAC:FY18 Expenses              -$112.45
+
+2017-04-13 * Sharma Airfare
+    ; Payment: Direct Bill
+    ; Ticket: https://pagure.io/ambassadors-apac/issue/294
+    Expense:Transportation           $500 ; partial split with EMEA
+    APAC:Q1:OSCAL                   -$500
diff --git a/FY19/ledger/council.ldg b/FY19/ledger/council.ldg
new file mode 100644
index 0000000..0f67716
--- /dev/null
+++ b/FY19/ledger/council.ldg
@@ -0,0 +1,53 @@
+;----------------------------------------------------------------------
+; Budgets and Movements
+;----------------------------------------------------------------------
+~ every 2 years
+    Budget                               $0
+    Budget:unixstickers.com              $416
+    APAC:Unallocated                    -$0
+    EMEA:Unallocated                    -$0
+    LATAM:Unallocated                   -$0
+    NA:Unallocated                      -$0
+    Flock                               -$0
+    Mindshare:Unallocated               -$0
+    Diversity-Inclusion:Unallocated     -$0
+    Council:Unallocated:stickermule     -$416
+    Council:Unallocated
+
+~ every 2 years
+    Council:Other:Podcast                            -$1400 ; https://pagure.io/Fedora-Council/tickets/issue/195
+    Council:Other:Podcast                            -$183 ; https://pagure.io/Fedora-Council/tickets/issue/192
+    Council:Other:Fedora Loves .NET                  -$108.20 ; https://pagure.io/Fedora-Council/tickets/issue/194 (stickers only)
+    Council:Unallocated:stickermule                   $108.20
+    Council:Other:Fedora Loves .NET                  -$30.95 ; https://pagure.io/Fedora-Council/tickets/issue/194
+    Council:Unallocated
+
+2017-03-27 * unixstickers.com credit for donations from sales at stickermule.com expires  September 30, 2018
+    ; this is restricted to use for sticker printing
+    Budget:unixstickers.com             $416
+    External:unixstickers.com          -$416
+
+2018-03-02 * Casting Words - Fedora Podcast #2
+    ; Payment: bex pcard
+    Expense:Outside Services/Training   $50
+    Council:Other:Podcast              -$50
+
+2018-03-12 * QuickShirt CZ
+    ; Payment: direct invoice
+    Expense:Trade Show                  $30.95 ; 639.60 CZK replacement shirt
+    Council:Other:Fedora Loves .NET    -$30.95
+
+2018-03-16 * Casting Words - Fedora Podcast #3 and #4
+    ; Payment: bex pcard
+    Expense:Outside Services/Training   $90.20
+    Council:Other:Podcast              -$90.20
+
+2018-04-04   Stickermule.com
+    ; Payment: vendor credit
+    Expense:Trade Show                  $108.20; stickers
+    Council:Other:Fedora Loves .NET    -$108.20
+
+2018-04-10   Paypal to x3mboy for SoundCloud and Simplecast
+    ; Payment: bex CC
+    Expense:Outside Services/Training   $190.44
+    Council:Other:Podcast              -$190.44
diff --git a/FY19/ledger/diversity.ldg b/FY19/ledger/diversity.ldg
new file mode 100644
index 0000000..fe9d8b3
--- /dev/null
+++ b/FY19/ledger/diversity.ldg
@@ -0,0 +1,11 @@
+~ every 2 years
+    ; Budget
+    Diversity-Inclusion:Unallocated             $0
+    Diversity-Inclusion:Swag                   -$115.57
+    Diversity-Inclusion:Unallocated
+
+2018-04-04 * Stickermule - Fedora Women Stickers
+    ; Payment: Transfer
+    ; Ticket: https://pagure.io/fedora-diversity/issue/59
+    Expense:Trade Show                           $115.57
+    Diversity-Inclusion:Swag                    -$115.57
diff --git a/FY19/ledger/emea.ldg b/FY19/ledger/emea.ldg
new file mode 100644
index 0000000..1b5dd12
--- /dev/null
+++ b/FY19/ledger/emea.ldg
@@ -0,0 +1,40 @@
+~ every 2 years
+    ; Budget
+    EMEA:Unallocated                             $0
+    EMEA:Q1                                     -$0
+    EMEA:Q2                                     -$0
+    EMEA:Q3                                     -$0
+    EMEA:Q4                                     -$0
+    EMEA:Unallocated
+
+~ every 2 years
+    ; Budget
+    EMEA:Q1                                      $0
+    EMEA:Q1:Swag                                -$360
+    EMEA:Q1:DORS-CLUC                           -$275
+    EMEA:Q1:OSCAL                               -$1650
+    EMEA:Unallocated
+
+2018-04-04 * Stickermule - Fedora Hexes
+    ; Payment: Transfer
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/57
+    Expense:Trade Show                           $115.57 ; Fedora Hex Stickers
+    EMEA:Q1:Swag                                -$115.57
+
+2018-04-10   Jona Azizaj Travel
+    ; Payment: bex CC
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/59
+    Expense:Transportation                       $273.80
+    EMEA:Q1:DORS-CLUC                           -$273.80
+
+2017-04-13 * Sharma Airfare
+    ; Payment: Direct Bill
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/61
+    Expense:Transportation           $469.52 ; partial split with APAC
+    APAC:Q1:OSCAL                   -$469.52
+
+2018-04-19 * Nemanja Milosevic Release Party F27 Novi Sad
+    ; Payment: jsimon CC - April 18
+    ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/32
+    Expense:Meals                                $156.59 ; Food Posters Snacks
+    EMEA:Q1:F27 Parties                         -$156.59
diff --git a/FY19/ledger/fad.ldg b/FY19/ledger/fad.ldg
new file mode 100644
index 0000000..298b177
--- /dev/null
+++ b/FY19/ledger/fad.ldg
@@ -0,0 +1,153 @@
+~ every 2 years
+    ; FAD Budgets
+    FADs:Unallocated            $0
+    FADs:Docs                  -$0; Docs FAD authorized in FY18 that spanned years
+    FADs:Mindshare             -$0; Mindshare FAD authorized in FY18 that spanned years
+    FADs:Infrastructure        -$10000; https://pagure.io/Fedora-Council/tickets/issue/183
+    FADs:Unallocated
+
+2018-03-01 * 10 ppl Dinner
+    ; Payment: IE2802500 - bex
+    Expense:Business Meals    $248.29 ; 204 EUR
+    FADs:Docs   -$248.29
+
+2018-03-02 * 12 ppl Dinner
+    ; Payment: IE2802500 - bex
+    Expense:Business Meals    $289.34 ; 235 EUR
+    FADs:Docs   -$289.34
+
+2018-03-02 * 6 ppl from Milan to Bolzano
+    ; Payment: IE2802500 - bex
+    Expense:Train    $275.92 ; 224.1 EUR
+    FADs:Mindshare   -$275.92
+
+2018-03-02 * Mayorga Taxi from MAD to train station
+    ; Payment: IE2802544 - bex
+    Expense:Taxi/Car Service    $36.94 ; 30 EUR
+    FADs:Docs   -$36.94
+
+2018-03-03 * Transfer from Hotel to SVQ (3 people) – Taxi 1
+    ; Payment: IE2802544 - bex
+    Expense:Taxi/Car Service    $34.47 ; 28 EUR
+    FADs:Docs   -$34.47
+
+2018-03-03 * Transfer from Hotel to SVQ (3 people) – Taxi 2
+    ; Payment: IE2802544 - bex
+    Expense:Taxi/Car Service    $34.84 ; 28.3 EUR
+    FADs:Docs   -$34.84
+
+2018-03-03 * Transfer from MXP to Train
+    ; Payment: IE2802500 - bex
+    Expense:Train    $96.04 ; 78 EUR
+    FADs:Mindshare   -$96.04
+
+2018-03-03 * Dinner: 6 ppl
+    ; Payment: IE2802500 - bex
+    Expense:Business Meals    $209.31 ; 170 EUR
+    FADs:Mindshare   -$209.31
+
+2018-03-04 * 8 ppl FAD Dinner
+    ; Payment: IE2802500 - bex
+    Expense:Business Meals    $280.72 ; 228 EUR
+    FADs:Mindshare   -$280.72
+
+2018-03-04 * Shuttle back from dinner for FAD
+    ; Payment: IE2802544 - bex
+    Expense:Taxi/Car Service    $18.47 ; 15 EUR
+    FADs:Mindshare   -$18.47
+
+2018-03-04 * 8 FAD Lunch – rounded
+    ; Payment: IE2802544 - bex
+    Expense:Business Meals    $129.28 ; 105 EUR
+    FADs:Mindshare   -$129.28
+
+2018-03-05 * 10 ppl FAD Dinner
+    ; Payment: IE2802500 - bex
+    Expense:Business Meals    $518.39 ; 421.2 EUR
+    FADs:Mindshare   -$518.39
+
+2018-03-06 * 9 ppl FAD Lunch – rounded
+    ; Payment: IE2802544 - bex
+    Expense:Business Meals    $202 ; 162.76 EUR
+    FADs:Mindshare   -$202
+
+2018-03-06 * Milan→Bolzano for 6
+    ; Payment: IE2802500 - bex
+    Expense:Train    $278.13 ; 224.1 EUR
+    FADs:Mindshare   -$278.13
+
+2018-03-06 * Bolzano→ Milan
+    ; Payment: IE2802500 - bex
+    Expense:Train    $45.05 ; 36.3 EUR
+    FADs:Mindshare   -$45.05
+
+2018-03-06 * Bolzano → Milan for 3
+    ; Payment: IE2802500 - bex
+    Expense:Train    $208.13 ; 167.7 EUR
+    FADs:Mindshare   -$208.13
+
+2018-03-06 * Bolzano→Venice
+    ; Payment: IE2802500 - bex
+    Expense:Train    $59.45 ; 47.9 EUR
+    FADs:Mindshare   -$59.45
+
+2018-03-06 * Dinner 8 ppl FAD
+    ; Payment: IE2802500 - bex
+    Expense:Business Meals    $231.96 ; 186.9 EUR
+    FADs:Mindshare   -$231.96
+
+2018-03-07 * lunches and coffee breaks for onsite meeting
+    ; Payment: IE2802500 - bex
+    Expense:Business Meals    $318.09 ; 256.2 EUR
+    FADs:Mindshare   -$318.09
+
+2018-03-07 * Additional Room
+    ; Payment: IE2802500 - bex
+    Expense:Lodging    $189.22 ; 152.4 EUR
+    FADs:Mindshare   -$189.22
+
+2018-03-13 * Docs FAD Travel - Marr
+    ; Payment: bex PCard
+    Expense:Transportation                    $17.78
+    Expense:Meals                             $80.63
+    Expense:Lodging                           $88.93
+    FADs:Docs                                -$187.34
+
+2018-03-13 * Docs FAD Travel - Flory
+    ; Payment: IE2804263 - bex CC
+    Expense:Transportation                    $39.25
+    Expense:Meals                             $15.49
+    Expense:Transportation:Paypal             $2.43
+    FADs:Docs                                -$57.17
+
+2018-03-13 * Mindshare FAD Travel - Flory
+    ; Payment: bex Pcard
+    Expense:Transportation                    $67.93
+    Expense:Meals                             $17.40
+    Expense:Transportation:Paypal             $2.77
+    FADs:Mindshare                           -$88.10
+
+2018-03-14 * Mindshare FAD Travel - Bebout
+    ; Payment: bex Pcard
+    Expense:Transportation                    $203.97
+    FADs:Mindshare                           -$203.97
+
+2018-03-16 * Projector for Mindshare FAD
+    ; Payment: IE2804293 - bex
+    Expense:Business Meeting                  $129.96
+    FADs:Mindshare                           -$129.96
+
+2018-03-15 * Barlow expenses
+    ; Payment: US2803903 - Barlow
+    Expense:Transportation                    $105
+    FADs:Infrastructure                      -$105
+
+2018-03-19 * pingou expenses
+    ; Payment: IE2806810 - Chibon, Doctor Pierre-Yves
+    Expense:Transportation                    $195.80 ; 159.70 EUR
+    FADs:Infrastructure                      -$195.80
+
+2018-04-03 * Smooge expenses
+    ; Payment: US2851604 - Smooge
+    Expense:Transportation                    $105
+    FADs:Infrastructure                      -$105
diff --git a/FY19/ledger/fedora.ledger b/FY19/ledger/fedora.ledger
new file mode 100644
index 0000000..edfe786
--- /dev/null
+++ b/FY19/ledger/fedora.ledger
@@ -0,0 +1 @@
+include *.ldg
diff --git a/FY19/ledger/flock.ldg b/FY19/ledger/flock.ldg
new file mode 100644
index 0000000..4e493d0
--- /dev/null
+++ b/FY19/ledger/flock.ldg
@@ -0,0 +1,26 @@
+~ every 2 years
+    ; Budget
+    Flock                         $0 ; allocated by council
+    ; Expenses
+    Flock:AV                     -$0
+    Flock:Activities             -$0 
+    Flock:Activities             -$0 
+    Flock:Badges                 -$0  
+    Flock:Bandwidth              -$0
+    Flock:Booklet                -$0    
+    Flock:Food                   -$0 
+    Flock:Food                   -$0 
+    Flock:Food                   -$0 
+    Flock:Food                   -$0    
+    Flock:Food:Sponsored Food    -$0
+    Flock:Meeting Room           -$0    
+    Flock:Photographer           -$0
+    Flock:Schedule               -$0 
+    Flock:Supplies               -$0
+    Flock:Supplies               -$0  
+    Flock:T-shirt                -$0 
+    Flock:Paypal Fees            -$0 
+    ; Copays
+    Flock:Copaid Travel          -$0 
+    ; Balance
+    Flock:Unallocated
diff --git a/FY19/ledger/latam.ldg b/FY19/ledger/latam.ldg
new file mode 100644
index 0000000..bd8f10a
--- /dev/null
+++ b/FY19/ledger/latam.ldg
@@ -0,0 +1,45 @@
+~ every 2 years
+    ; Budget
+    LATAM:Unallocated                    $0
+    LATAM:FY 18 Swag                    -$0 ; delays caused by proofing
+    LATAM:Q1                            -$0
+    LATAM:Q2                            -$0
+    LATAM:Q3                            -$0
+    LATAM:Q4                            -$0
+    LATAM:Unallocated
+
+; Events from Q1 FY19 in Latam
+~ every 2 years
+    LATAM:Q1                                            $0
+    LATAM:Q1:F27 Release Party Managua                 -$54.22
+    LATAM:Q1:F27 Release Party Ecuador                 -$309.00
+    LATAM:Q1
+
+2018-03-01   F27 Release Party Managua
+    ; Payment: CROSS
+    ; Country: Nicaragua
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/448
+    Expense:Meals                          $51.89
+    Expense:Meals:Paypal                    $2.33 
+    LATAM:Q1:F27 Release Party Managua    -$54.22
+
+2018-03-01   F27 Release Party Ecuador
+    ; Payment: Pending
+    ; Country: Ecuador
+    ; Ticket: https://pagure.io/ambassadors-latam/tasks/issue/447
+    Expense:Meals                         $168.42
+    Expense:Meals:Paypal                   $13.31
+    Expense:Other Marketing Costs         $127.26
+    LATAM:Q1:F27 Release Party Ecuador   -$308.99
+
+2018-03-14 * StickerMule
+    ; Payment: bex Pcard
+    ; 2.25" Fedora LATAM buttons
+    Expense:Trade Show                   $757
+    LATAM:FY 18 Swag                    -$757
+
+2018-03-14   The Pen Guy
+    ; Payment: Stormy CC
+    ; Fedora Pens
+    Expense:Trade Show                   $820
+    LATAM:FY 18 Swag                    -$820
diff --git a/FY19/ledger/na.ldg b/FY19/ledger/na.ldg
new file mode 100644
index 0000000..775bdba
--- /dev/null
+++ b/FY19/ledger/na.ldg
@@ -0,0 +1,55 @@
+~ every 2 years
+    ; Budget
+    NA:Unallocated                                    $0
+    NA:FY18 SWAG                                      $0
+    NA:Q1                                            -$0
+    NA:Q2                                            -$0
+    NA:Q3                                            -$0
+    NA:Q4                                            -$0
+    NA:Unallocated
+
+~ every 2 years
+    ; Budget
+    NA:Q1                                             $0
+    NA:Q1:SCaLE16x                                   -$2000 ; https://pagure.io/ambassadors-na/tasks/issue/191
+    NA:Q1:LFNW                                       -$200  ; https://pagure.io/ambassadors-na/tasks/issue/192
+    NA:Q1:LFNW                                       -$600  ; https://pagure.io/ambassadors-na/tasks/issue/192
+    NA:Unallocated
+
+~ every 2 years
+    ; Budget
+    NA:Q2                                             $0
+    NA:Q2:Southeast Linux Fest                       -$900 ; https://pagure.io/ambassadors-na/tasks/issue/194
+    NA:Unallocated
+
+2018-03-13 * The Pen Guy - NA Swag from FY18
+    ; Payment: bex Pcard
+    Expense:Trade Show              $1200
+    NA:FY18 SWAG                   -$1200
+
+2018-03-14 * Lustre Cal - case badges from FY18
+    ; Payment: jmadriaga Pcard
+    Expense:Trade Show              $1143.68
+    NA:FY18 SWAG                   -$1143.68
+
+2018-03-20 * UPS
+    ; Payment: NA CC - March
+    Expense:Courier/Shipping             $25.34
+    NA:Q1:SCaLE16X                      -$25.34
+
+2018-03-20 * UPS
+    ; Payment: NA CC - March
+    Expense:Courier/Shipping             $67.36
+    NA:Q1:SCaLE16x                      -$67.36
+
+2018-04-04   Alex Costa - Scale 16x
+    ; Payment: bex CC
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/449
+    Expense:Transportation          $568.86 ; 10299.13 MXN via transferwise
+    NA:Q1:SCaLE16x                 -$568.86
+    
+2018-04-03   Perry Rivera - Scale 16x
+    ; Payment: NA CC
+    ; Ticket: https://pagure.io/ambassadors-na/requests/issue/448
+    Expense:Lodging and Travel      $734.56 ; 
+    NA:Q1:SCaLE16x                 -$734.56
diff --git a/FY19/ledger/summer-coding.ldg b/FY19/ledger/summer-coding.ldg
new file mode 100644
index 0000000..ac2f1f3
--- /dev/null
+++ b/FY19/ledger/summer-coding.ldg
@@ -0,0 +1,3 @@
+~ every 2 years
+    Summer Coding:Unallocated       $0
+
diff --git a/FY19/mindshare.adoc b/FY19/mindshare.adoc
new file mode 100644
index 0000000..53013fa
--- /dev/null
+++ b/FY19/mindshare.adoc
@@ -0,0 +1,14 @@
+= Fedora Mindshare Budget Report
+
+== Budget Report
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/mindshare.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY19/na.adoc b/FY19/na.adoc
new file mode 100644
index 0000000..44656c2
--- /dev/null
+++ b/FY19/na.adoc
@@ -0,0 +1,57 @@
+Fedora Ambassadors - North America Budget Report
+================================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/na.csv[]
+|===
+
+
+Q1 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/na-q1.csv[]
+|===
+
+Q2 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/na-q2.csv[]
+|===
+
+Q3 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/na-q3.csv[]
+|===
+
+Q4 Budget Report
+----------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/na-q4.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY19/overall.adoc b/FY19/overall.adoc
new file mode 100644
index 0000000..3ac07c0
--- /dev/null
+++ b/FY19/overall.adoc
@@ -0,0 +1,26 @@
+Fedora Overall Budget Report
+============================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/overall.csv[]
+|===
+
+
+Source of Budget Report
+-----------------------
+
+[caption="", format="csv", separator="	", cols="1*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Source	Amount
+include::FY19/source.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY19/people.adoc b/FY19/people.adoc
new file mode 100644
index 0000000..74976cd
--- /dev/null
+++ b/FY19/people.adoc
@@ -0,0 +1,33 @@
+// This file defines attributes (entities) for the various people involved in the budget
+
+// APAC
+:apac_treasurer_name: PJ Pandit (Pjp)
+:apac_treasurer_email: pj.pandit@yahoo.co.in
+:apac_cc_name: Woo Huiren (woohuiren)
+:apac_cc_email: woohuiren@fedoraproject.org
+
+// EMEA
+:emea_treasurer_name: Zacharias Mitzelos (mitzie)
+:emea_treasurer_email: mitzie@mitzelos.com
+:emea_cc_name: Joerg Simon
+:emea_cc_email: jsimon@fedoraproject.org
+
+
+// LATAM
+:latam_treasurer_name: Abdel G. Martínez L.
+:latam_treasurer_email: abdel.g.martinez.l@gmail.com
+:latam_cc_name: Neville Cross
+:latam_cc_email: neville@taygon.com
+
+// NA
+:na_treasurer_name: Andrew Ward
+:na_treasurer_email: award3535@tds.net
+:na_cc_name: Andrew Ward
+:na_cc_email: award3535@tds.net
+
+// Other
+:FCAIC_name: Brian Exelbierd
+:FCAIC_email: bex@pobox.com
+
+
+Built on: {localdatetime}
diff --git a/FY19/summer-coding.adoc b/FY19/summer-coding.adoc
new file mode 100644
index 0000000..d5733b9
--- /dev/null
+++ b/FY19/summer-coding.adoc
@@ -0,0 +1,15 @@
+Summer Coding
+=============
+
+Summer Coding Budget Report
+---------------------------
+
+[caption="", format="csv", separator="	", cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category	Budget	Spent So Far	Remaining Budget	Percent Spent
+include::FY19/summer-coding.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/_builder/budget2tsv b/_builder/budget2tsv
index 2113f7b..901ee55 100755
--- a/_builder/budget2tsv
+++ b/_builder/budget2tsv
@@ -14,5 +14,21 @@
 # Set up any remaining negative values to be -$ not $-
 # Remove any Account Nesting present by removing the first colon separated value
 # Convert remaining colons to dashes
-# Swap the first and second columns to get to the goal order
-grep -v '^----' | sed 's/^ \+//' | sed 's/ \+ /\t/g'  | sed 's/ \$/\t\$/g' | sed 's/^\$\([0-9]\)/-\$\1/' | sed 's/^\$-/\$/'  | sed 's/0$/0%/' | sed 's/0	\([a-zA-F]\)/0%	\1/' | sed 's/%$/%\tTotal/' | sed 's/^\([-$]*[0-9.,]\+\t\)\$-/\1\$/' | sed 's/\$-/-\$/g' | sed 's/\t[^:\t]\+:/\t/' | sed 's/:/-/g' | awk 'BEGIN{ FS="\t" } {print $2 "\t" $1 "\t" $3 "\t" $4 "\t" $5}'
+# Swap the first and second columns to put Budget before spending
+# Move the last column to be the first to put the category on the left
+grep -v '^----' | \
+    sed 's/^ \+//' | \
+    sed 's/ \+ /\t/g'  | \
+    sed 's/\([^a-zA-Z]\) \([^a-zA-Z]\)/\1\t\2/g' | \
+    sed 's/^\$\([0-9]\)/-\$\1/' | \
+    sed 's/^\$-/\$/'  | \
+    sed 's/0$/0%/' | \
+    sed 's/0	\([a-zA-F]\)/0%	\1/' | \
+    sed 's/%$/%\tTotal/' | \
+    sed 's/^\([-$]*[0-9.,]\+\t\)\$-/\1\$/' | \
+    sed 's/\$-/-\$/g' | \
+    sed 's/\t[^:\t]\+:/\t/' | \
+    sed 's/:/-/g' | \
+    awk 'BEGIN{ FS="\t" } {print $2 "\t" $1 "\t" $3 "\t" $4 "\t" $5}'| awk 'BEGIN{ FS="\t" } {print $5 "\t" $1 "\t" $2 "\t" $3 "\t" $4}'
+
+#sed 's/ \$/\t\$/g' | \
diff --git a/_builder/jenkins_builder b/_builder/jenkins_builder
index d567634..dbc3698 100755
--- a/_builder/jenkins_builder
+++ b/_builder/jenkins_builder
@@ -10,6 +10,9 @@ cd ..
 cd FY18
 ./gen_reports
 cd ..
+cd FY19
+./gen_reports
+cd ..
 
 # Rebuild site
 /home/jenkins/bin/asciibinder package
@@ -41,3 +44,6 @@ cp -r ../../_package/main/* .
 git add .
 git commit -m "site update"
 git push origin stg
+git checkout prod
+git merge stg
+git push origin prod
diff --git a/_images/favicon32x32.png b/_images/favicon32x32.png
index d33bd5e..72bb73d 100644
Binary files a/_images/favicon32x32.png and b/_images/favicon32x32.png differ
diff --git a/_topic_map.yml b/_topic_map.yml
index d2293be..fc80f76 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -37,6 +37,34 @@ Topics:
   - Name: Understanding Budgets
     File: faq_budgeting
 ---
+Name: DRAFT - FY 19 Budget Reports
+Dir: FY19
+Topics:
+  - Name: Introduction
+    File: README
+  - Name: Overall Budget
+    File: overall
+  - Name: Diversity & Inclusion Budget
+    File: d-i
+  - Name: Mindshare Budget
+    File: mindshare
+  - Name: APAC Region Budget
+    File: apac
+  - Name: EMEA Region Budget
+    File: emea
+  - Name: LATAM Region Budget
+    File: latam
+  - Name: NA Region Budget
+    File: na
+  - Name: Events Budget
+    File: events
+  - Name: FADs Budget
+    File: fads
+  - Name: Summer Coding Budget
+    File: summer-coding
+  - Name: Council and Other Expenses
+    File: council
+---
 Name: FY 18 Budget Reports
 Dir: FY18
 Topics:
diff --git a/docs/faq_budgeting.adoc b/docs/faq_budgeting.adoc
index 07ecf46..2d4ddb6 100644
--- a/docs/faq_budgeting.adoc
+++ b/docs/faq_budgeting.adoc
@@ -115,7 +115,7 @@ how much money you have left to allocate.  When spending happens you'll
 be able to see if the budgets were accurate and if there is any overage
 or underspend.
 
-Here is an example, Using LATAM and some ficticious numbers:
+Here is an example, Using LATAM and some fictitious numbers:
 
 ```
 ~ every 2 years
diff --git a/docs/faq_entries.adoc b/docs/faq_entries.adoc
index 1e6417e..532ddd1 100644
--- a/docs/faq_entries.adoc
+++ b/docs/faq_entries.adoc
@@ -17,7 +17,7 @@ The goal is to have accurate timely records that are easily maintained by a larg
 
 Swag is budgeted for (#1) and then purchased (#2).  If your region buys swag in large quantities and then distributes it across multiple events, it is not necessary for the ledger files to show how much swag went to each event (unless that is useful for you).  From a Fedora Project perspective we just need to know how much we budgeted for Swag and how much we spent.
 
-It is also not necessary to break out bank fees like Paypal, however it is strongly encouraged that you do it.  This will allow us to udit these fees and see if we can get some lower cost options where it is possible or alternatives from accounting.  If you don't want to break out those fees though, you are not required to do so.
+It is also not necessary to break out bank fees like Paypal, however it is strongly encouraged that you do it.  This will allow us to edit these fees and see if we can get some lower cost options where it is possible or alternatives from accounting.  If you don't want to break out those fees though, you are not required to do so.
 
 
 What does an transaction entry look like?
@@ -36,13 +36,13 @@ Ledger has very few formatting requirements.  For consistency we have adopted th
     EMEA:Q3:Linux Days Prague  -$540.55                         <7>
 ----
 
-<1> The date is always `YYYY-MM-DD` followed by 3 spaces and a meaninful payee description.  All of the following lines should be indented by 4 spaces.  This line begins in column 1.  There is *no* leading whitespace allowed.
+<1> The date is always `YYYY-MM-DD` followed by 3 spaces and a meaningful payee description.  All of the following lines should be indented by 4 spaces.  This line begins in column 1.  There is *no* leading whitespace allowed.
 <2> This is the url to the ticket that approved the expense.  This is mostly found on regional expenses.  This is a ledger http://www.ledger-cli.org/3.0/doc/ledger3.html#Metadata[metadata tag].
 <3> This is the one-line summary of why we spent the money.  This is mostly used for credit card reconciliation purposes.  This is also a ledger metadata tag.
 <4> This is a note about how we paid the expense.  Typically you will see `CC-<region>` or an internal Red Hat payment number.
 <5> Comments are awesome.  Make some where explanations are useful.  Comments begin with a semicolon, `;`.  Comments can also be made at the end of any line.  See the FAQ below for Ambassador region specific comment requirements.
 <6> These are expense categories.  There is a restricted list of accounts.  You can list as many as are needed.  See the next question.
-<7> This is the event or budget the transaction is related too.  In this example, this is a transaction from the EMEA region in the 3rd Quarter related to the Linux Days Prague event.  This transaction is completely made up.
+<7> This is the event or budget the transaction is related to.  In this example, this is a transaction from the EMEA region in the 3rd Quarter related to the Linux Days Prague event.  This transaction is completely made up.
 
 Note: Amounts are not required to be aligned vertically.  Amounts are required to be in US Dollars and must be of the form `$###`.  If there are fractions of a dollar that must be separated with a '.' (period/dot) as the decimal separator and *not* a ',' (comma).
 
@@ -60,7 +60,7 @@ However, you don't have to understand double entry account or debits and credits
 What are all of the expense categories?
 ---------------------------------------
 
-The Fedora project is mostly funded by Red Hat.  As part of our support, Red Hat provides us with some credit cards to use.  We have to report all of our expenses to Red Hat as one of a very small set of categories.  Therefore we have restricted all expenses to these categories.  If we find that we need to track other things, we will begin to do so.  Start a converation via an Issue in this repository or on our mailing list, budget-devel@fedoraproject.org.
+The Fedora project is mostly funded by Red Hat.  As part of our support, Red Hat provides us with some credit cards to use.  We have to report all of our expenses to Red Hat as one of a very small set of categories.  Therefore we have restricted all expenses to these categories.  If we find that we need to track other things, we will begin to do so.  Start a conversation via an Issue in this repository or on our mailing list, budget-devel@fedoraproject.org.
 
 The categories are:
 
@@ -100,7 +100,7 @@ We are allowed to have further levels of expense categories if we would like.  A
     EMEA:Q3:Linux Days Prague    -$333.44
 ----
 
-This could be done to differentiate between types of transportation (`Expense:Transportion:Air` vs `Expense:Transportation:Train`) if a region saw value in analyzing that data.
+This could be done to differentiate between types of transportation (`Expense:Transportation:Air` vs `Expense:Transportation:Train`) if a region saw value in analyzing that data.
 
 
 Are there any special requirements? (LATAM Ambassadors)
diff --git a/docs/faq_general.adoc b/docs/faq_general.adoc
index 4be4de2..0be4c98 100644
--- a/docs/faq_general.adoc
+++ b/docs/faq_general.adoc
@@ -57,7 +57,7 @@ The Fedora Project has adopted http://ledger-cli.org/[ledger], a plain text acco
 * Reporting - ledger supports register, balance, budget, and csv reporting.
 * FOSS - ledger is open source, free software.
 * Packaged - ledger was packaged in Fedora long before it was adopted for this purpose.
-* Community - ledger has an active upstream community.  There are serveral cooperating forks and related projects that keep the tool current.
+* Community - ledger has an active upstream community.  There are several cooperating forks and related projects that keep the tool current.
 
 Where is the data stored?
 -------------------------
diff --git a/docs/flock_funding_faq.adoc b/docs/flock_funding_faq.adoc
index 81b53a8..4520baa 100644
--- a/docs/flock_funding_faq.adoc
+++ b/docs/flock_funding_faq.adoc
@@ -35,7 +35,7 @@ Each funding offer will describe the next steps for your situation.  Typically, 
 For Flock 2017, hotel funded attendees are being sent two questions to reply directly to by email:
 
 1. What is your expected date of arrival?
-2. Solely for the purposes of roommmate assignment, what is your gender?
+2. Solely for the purposes of roommate assignment, what is your gender?
 
 What does a complete funding process looks like?
 ------------------------------------------------
@@ -49,4 +49,4 @@ What does a complete funding process looks like?
 I have special requests (diet, preferable airport, specific schedule), how do I communicate those?
 --------------------------------------------------------------------------------------------------
 
-If you have these needs during the conference, this should have been communicated in your Flock registration.  If you have these needs during travel, there is a space on the travel form where you can indicate these items.  In general, Flock funds basic travel accomodations and no extras.  If there are costs for the extra services, specific routings, etc. you will generally be asked to pay them.  Exceptions are considered on a case-by-case basis and there is no firm guideline for what will be paid by Fedora.
+If you have these needs during the conference, this should have been communicated in your Flock registration.  If you have these needs during travel, there is a space on the travel form where you can indicate these items.  In general, Flock funds basic travel accommodations and no extras.  If there are costs for the extra services, specific routings, etc. you will generally be asked to pay them.  Exceptions are considered on a case-by-case basis and there is no firm guideline for what will be paid by Fedora.
diff --git a/docs/index.adoc b/docs/index.adoc
index 43005ce..753e3b2 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -1,9 +1,9 @@
 Fedora Budget
 =============
 
-This website is the public record for all information regarding money allocated and spent by the Fedora Project. Budget numbers are updated after every entered transaction.footnote:[Today this has to be done manually, we are working on implemeting a git webhook for build and publish.  Want to help? contact mailto:bex@pobox.com[Brian Exelbierd]].
+This website is the public record for all information regarding money allocated and spent by the Fedora Project. Budget numbers are updated after every entered transaction.footnote:[Today this has to be done manually, we are working on implementing a git webhook for build and publish.  Want to help? contact mailto:bex@pobox.com[Brian Exelbierd]].
 
-The Fedora Project operates on fiscal year from March 1 to February 28.  Every year the Fedora Council allocates the budget to various groups inside of Fedora.  For more information, read the link:docs/faq_general.html[general FAQ].
+The Fedora Project operates on fiscal year from March 1 to February 28.  Every year the Fedora Council allocates the budget to various groups inside of Fedora.  For more information, read the link:faq_general.html[general FAQ].
 
 To the left you can find the documentation and reporting for various Fiscal Years.
 
diff --git a/docs/reimbursement.adoc b/docs/reimbursement.adoc
index aa54ca7..da694cc 100644
--- a/docs/reimbursement.adoc
+++ b/docs/reimbursement.adoc
@@ -3,7 +3,7 @@ Reimbursement Policies
 
 **Note: Subgroups are free to add additional requirements that are more strict than the ones outlined below.**
 
-Holding with our current policies, reimbursement will depend on submission of an Event Report to the appropriate channels (mail lists, communityblog, and the planet/magazine when applicable.  If you attend a FAD you should write your report relative to the FAD.  In general every funded person is expected write a separate report unless it is demonstrated that they all contributed to the larger overall reporting.
+Holding with our current policies, reimbursement will depend on submission of an Event Report to the appropriate channels (mail lists, community blog, and the planet/magazine when applicable.  If you attend a FAD you should write your report relative to the FAD.  In general every funded person is expected write a separate report unless it is demonstrated that they all contributed to the larger overall reporting.
 
 Event reports include a very short list of bullet points. These bullet points are the necessary ammunition we need to reinforce our proposals to increase funding for regional programs in the future.  These bullet points should cover two areas, *Action* and *Impact*.
 

From 72f238443fb2cb69770a7b4732ad931e821446fe Mon Sep 17 00:00:00 2001
From: P J P <pjp@fedoraproject.org>
Date: Apr 28 2018 09:06:57 +0000
Subject: [PATCH 2/2] F28 Release Party Bengaluru


---

diff --git a/FY19/ledger/apac.ldg b/FY19/ledger/apac.ldg
index fcd7538..39cceaf 100644
--- a/FY19/ledger/apac.ldg
+++ b/FY19/ledger/apac.ldg
@@ -12,6 +12,7 @@
     ; Budget
     APAC:Q1                                      $0
     APAC:Q1:OSCAL                               -$500 ; https://pagure.io/ambassadors-apac/issue/294
+    APAC:Q1:F28 RP BLR                          -$100 ; https://pagure.io/ambassadors-apac/issue/296
     APAC:Unallocated
 
 2017-03-13 * Swag for China