diff --git a/.gitignore b/.gitignore
index eba74f4..bfd854c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-venv/
\ No newline at end of file
+venv/
+.DS_Store
\ No newline at end of file
diff --git a/documents/README.md b/documents/README.md
new file mode 100644
index 0000000..3606e56
--- /dev/null
+++ b/documents/README.md
@@ -0,0 +1,7 @@
+# Documents
+
+Attach documents to the journal of an account like so:
+
+```
+2013-11-03 document Liabilities:CreditCard "/home/joe/stmts/apr-2014.pdf"
+```
\ No newline at end of file
diff --git a/ledger/budget.beancount b/ledger/budget.beancount
index 2df760a..d020b95 100644
--- a/ledger/budget.beancount
+++ b/ledger/budget.beancount
@@ -13,7 +13,7 @@
2024-01-01 custom "budget" Expenses:MantenimentCotxe "yearly" 180.00 EUR
2024-01-01 custom "budget" Expenses:Educació "yearly" 200.00 EUR
-2024-01-01 custom "budget" Expenses:Medic "yearly" 400.00 EUR
+2024-01-01 custom "budget" Expenses:Medic "yearly" 800.00 EUR
2024-01-01 custom "budget" Expenses:Vacances "yearly" 2000.00 EUR
2024-01-01 custom "budget" Expenses:Taxes:ImpostCirculacio "yearly" 55.00 EUR
2024-01-01 custom "budget" Expenses:NintendoOnline "yearly" 35.00 EUR
diff --git a/ledger/events/1996/06.beancount b/ledger/events/1996/06.beancount
new file mode 100644
index 0000000..5e4f634
--- /dev/null
+++ b/ledger/events/1996/06.beancount
@@ -0,0 +1 @@
+1996-06-23 event "address" "Cadí, 22, Santa Eugenia de Berga, 08507, Barcelona, Espanya"
\ No newline at end of file
diff --git a/ledger/events/2021/04.beancount b/ledger/events/2021/04.beancount
new file mode 100644
index 0000000..111dac3
--- /dev/null
+++ b/ledger/events/2021/04.beancount
@@ -0,0 +1 @@
+2021-04-21 event "employer" "Zurich Insurance PLC Esp."
\ No newline at end of file
diff --git a/ledger/events/2024/01.beancount b/ledger/events/2024/01.beancount
new file mode 100644
index 0000000..f237c69
--- /dev/null
+++ b/ledger/events/2024/01.beancount
@@ -0,0 +1 @@
+2024-01-01 event "location" "Mallorca"
\ No newline at end of file
diff --git a/ledger/events/index.beancount b/ledger/events/index.beancount
new file mode 100644
index 0000000..eb06cf1
--- /dev/null
+++ b/ledger/events/index.beancount
@@ -0,0 +1,3 @@
+include "1996/*"
+include "2021/*"
+include "2024/*"
\ No newline at end of file
diff --git a/ledger/main.beancount b/ledger/main.beancount
index 869df2e..beb100a 100644
--- a/ledger/main.beancount
+++ b/ledger/main.beancount
@@ -7,10 +7,12 @@ plugin "beancount.plugins.implicit_prices"
option "title" "Roger Oriol Ledger"
option "operating_currency" "EUR"
option "inferred_tolerance_default" "*:0.001"
+option "documents" "../documents"
* Imports
include "accounts.beancount"
include "commodities.beancount"
include "budget.beancount"
-include "trading/*"
-include "transactions/*"
\ No newline at end of file
+include "trading/index.beancount"
+include "transactions/index.beancount"
+include "events/index.beancount"
\ No newline at end of file
diff --git a/ledger/trading/2024_01.beancount b/ledger/trading/2024/01.beancount
similarity index 92%
rename from ledger/trading/2024_01.beancount
rename to ledger/trading/2024/01.beancount
index 7d8a0f7..dd40fee 100644
--- a/ledger/trading/2024_01.beancount
+++ b/ledger/trading/2024/01.beancount
@@ -3,4 +3,5 @@
;2021-07-19 price BNPDISTECH 1567.214485 EUR
;2021-07-19 price JPMTECH 6.101629 EUR
;2021-07-19 price PLTR 5.994 EUR
-;2021-07-19 price IRNT 0.2185 EUR
\ No newline at end of file
+;2021-07-19 price IRNT 0.2185 EUR
+2023-12-31 price USD 0.93 EUR
\ No newline at end of file
diff --git a/ledger/trading/index.beancount b/ledger/trading/index.beancount
new file mode 100644
index 0000000..e3cd6be
--- /dev/null
+++ b/ledger/trading/index.beancount
@@ -0,0 +1 @@
+include "2024/*"
\ No newline at end of file
diff --git a/ledger/transactions/2024/01.beancount b/ledger/transactions/2024/01.beancount
new file mode 100644
index 0000000..f305b9d
--- /dev/null
+++ b/ledger/transactions/2024/01.beancount
@@ -0,0 +1,73 @@
+2023-12-31 * "Balanç inicial EUR"
+ Assets:Liquid:Caixabank:Corrent 18903.80 EUR
+ Assets:Liquid:Caixabank:Estalvi 12666.49 EUR
+ Assets:Liquid:R4:EUR 44.04 EUR
+ Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD {237.62 EUR}
+ Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK {177.773 EUR}
+ Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH {41.06 EUR}
+ Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC {62.84 EUR}
+ Assets:Benefits:Edenred:TicketsRestaurant 0 EUR
+ Assets:Benefits:Edenred:TarjetaTransport 0 EUR
+ Assets:PersonalProperty:VivendaPrincipal 0 EUR
+ Assets:PersonalProperty:Cotxe 10000 EUR
+ Assets:PersonalProperty:JoiesArtCollecionables 1250 EUR
+ Assets:PersonalProperty:MetallsPreciosos 0 EUR
+ Assets:PersonalProperty:AltresPropietats 0 EUR
+ Assets:Debt:DeutesPerCobrar 0 EUR
+ Equity:Opening-Balances
+2023-12-31 * "Balanç inicial USD"
+ Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH {2195.55 USD}
+ Assets:Invest:R4:PLTR 10 PLTR {16.025 USD}
+ Assets:Invest:R4:MSFT 4 MSFT {341.8 USD}
+ Equity:Opening-Balances:USD
+
+2024-01-01 balance Assets:Liquid:Caixabank:Corrent 18903.80 EUR
+2024-01-01 balance Assets:Liquid:Caixabank:Estalvi 12666.49 EUR
+2024-01-01 balance Assets:Liquid:R4:EUR 44.04 EUR
+2024-01-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD
+2024-01-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
+2024-01-01 balance Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH
+2024-01-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-01-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
+2024-01-01 balance Assets:Invest:R4:PLTR 10 PLTR
+2024-01-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-01-01 balance Assets:Benefits:Edenred:TicketsRestaurant 0 EUR
+2024-01-01 balance Assets:Benefits:Edenred:TarjetaTransport 0 EUR
+2024-01-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR
+2024-01-01 balance Assets:PersonalProperty:Cotxe 10000 EUR
+2024-01-01 balance Assets:PersonalProperty:JoiesArtCollecionables 1250 EUR
+2024-01-01 balance Assets:PersonalProperty:MetallsPreciosos 0 EUR
+2024-01-01 balance Assets:PersonalProperty:AltresPropietats 0 EUR
+2024-01-01 balance Assets:Debt:DeutesPerCobrar 0 EUR
+
+2024-01-01 * "Zurich" "Cuota gimnàs Andjoy"
+ Expenses:Gimnàs 508.80 EUR
+ Income:Work:Zurich:Gimnas
+2024-01-01 * "Zurich" "Cuota seguro salut Cigna Salud OPT (solo cobertura extra hospitalaria)"
+ Expenses:Medic 414.60 EUR
+ Income:Work:Zurich:SeguroMedic
+2024-01-01 * "Zurich" "Targeta Transport"
+ Assets:Benefits:Edenred:TarjetaTransport 40 EUR
+ Income:Work:Zurich:TarjetaTransport
+2024-01-01 * "Zurich" "Targeta Restaurant"
+ Assets:Benefits:Edenred:TicketsRestaurant 209 EUR
+ Income:Work:Zurich:TicketsRestaurant
+
+2024-02-01 balance Assets:Liquid:Caixabank:Corrent 18903.80 EUR
+2024-02-01 balance Assets:Liquid:Caixabank:Estalvi 12666.49 EUR
+2024-02-01 balance Assets:Liquid:R4:EUR 44.04 EUR
+2024-02-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD
+2024-02-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
+2024-02-01 balance Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH
+2024-02-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-02-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
+2024-02-01 balance Assets:Invest:R4:PLTR 10 PLTR
+2024-02-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-02-01 balance Assets:Benefits:Edenred:TicketsRestaurant 209 EUR
+2024-02-01 balance Assets:Benefits:Edenred:TarjetaTransport 40 EUR
+2024-02-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR
+2024-02-01 balance Assets:PersonalProperty:Cotxe 10000 EUR
+2024-02-01 balance Assets:PersonalProperty:JoiesArtCollecionables 1250 EUR
+2024-02-01 balance Assets:PersonalProperty:MetallsPreciosos 0 EUR
+2024-02-01 balance Assets:PersonalProperty:AltresPropietats 0 EUR
+2024-02-01 balance Assets:Debt:DeutesPerCobrar 0 EUR
\ No newline at end of file
diff --git a/ledger/transactions/2024_01.beancount b/ledger/transactions/2024_01.beancount
deleted file mode 100644
index 57e61a9..0000000
--- a/ledger/transactions/2024_01.beancount
+++ /dev/null
@@ -1,15 +0,0 @@
-2024-01-01 * "Balanç inicial EUR"
- Assets:Liquid:Caixabank:Corrent 18903.80 EUR
- Assets:Liquid:Caixabank:Estalvi 12666.49 EUR
- Assets:Liquid:R4:EUR 44.04 EUR
- Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD {237.62 EUR}
- Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK {177.773 EUR}
- Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH {41.06 EUR}
- Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC {62.84 EUR}
- Equity:Opening-Balances:USD 2315.65 USD {0.93 EUR}
- Equity:Opening-Balances
-2024-01-01 * "Balanç inicial USD"
- Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH {2195.55 USD}
- Assets:Invest:R4:PLTR 10 PLTR {16.025 USD}
- Assets:Invest:R4:MSFT 4 MSFT {341.8 USD}
- Equity:Opening-Balances:USD
diff --git a/ledger/transactions/index.beancount b/ledger/transactions/index.beancount
new file mode 100644
index 0000000..e3cd6be
--- /dev/null
+++ b/ledger/transactions/index.beancount
@@ -0,0 +1 @@
+include "2024/*"
\ No newline at end of file
diff --git a/reports/income/2023/12.html b/reports/income/2023/12.html
new file mode 100644
index 0000000..83fe5fc
--- /dev/null
+++ b/reports/income/2023/12.html
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Income
+
+
+
+| Account |
+EUR |
+Other |
+
+
+
+| Income |
+ |
+ |
+
+
+| Income:Work |
+ |
+ |
+
+
+| Income:Work:Zurich |
+ |
+ |
+
+
+| Income:Work:Zurich:Gimnas |
+-508.80 |
+ |
+
+
+| Income:Work:Zurich:SeguroMedic |
+-414.60 |
+ |
+
+
+| Income:Work:Zurich:TarjetaTransport |
+-40.000 |
+ |
+
+
+| Income:Work:Zurich:TicketsRestaurant |
+-209.000 |
+ |
+
+
+ |
+-1172.400 |
+ |
+
+
+
+
+
+
+
+
+
+
Expenses
+
+
+
+| Account |
+EUR |
+Other |
+
+
+
+| Expenses |
+ |
+ |
+
+
+| Expenses:Altres |
+ |
+ |
+
+
+| Expenses:AmazonPrime |
+ |
+ |
+
+
+| Expenses:CarnetJove |
+ |
+ |
+
+
+| Expenses:Educació |
+ |
+ |
+
+
+| Expenses:Entreteniment |
+ |
+ |
+
+
+| Expenses:FacturesUtilitats |
+ |
+ |
+
+
+| Expenses:Gasolina |
+ |
+ |
+
+
+| Expenses:Gimnàs |
+508.80 |
+ |
+
+
+| Expenses:Insurance |
+ |
+ |
+
+
+| Expenses:Insurance:Cotxe |
+ |
+ |
+
+
+| Expenses:Internet |
+ |
+ |
+
+
+| Expenses:Lloguer |
+ |
+ |
+
+
+| Expenses:MantenimentCotxe |
+ |
+ |
+
+
+| Expenses:MarcaPersonal |
+ |
+ |
+
+
+| Expenses:Medic |
+414.60 |
+ |
+
+
+| Expenses:MenjarFora |
+ |
+ |
+
+
+| Expenses:Mobilitat |
+ |
+ |
+
+
+| Expenses:NintendoOnline |
+ |
+ |
+
+
+| Expenses:Parking |
+ |
+ |
+
+
+| Expenses:Perruqueria |
+ |
+ |
+
+
+| Expenses:Roba |
+ |
+ |
+
+
+| Expenses:Supermercat |
+ |
+ |
+
+
+| Expenses:Taxes |
+ |
+ |
+
+
+| Expenses:Taxes:ImpostCirculacio |
+ |
+ |
+
+
+| Expenses:Vacances |
+ |
+ |
+
+
+ |
+923.40 |
+ |
+
+
+
+
+
+
+
+
+
+