Merge branch 'release/4.6.8'

Updated changelog.
Updated version.
2026-01-04 17:41:21 +00:00 · 2017-10-15 08:57:11 +02:00 · 2017-10-15 08:52:36 +02:00 · 2017-10-15 08:45:12 +02:00 · 2017-10-15 08:44:16 +02:00 · 2017-10-15 08:31:17 +02:00
809 changed files with 53120 additions and 19621 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+# Ignore composer specific files and vendor folder
+composer.phar
+composer.lock
+vendor
--- a/.env.docker
+++ b/.env.docker
@@ -1,7 +1,6 @@
 APP_ENV=${FF_APP_ENV}
 APP_DEBUG=false
-APP_FORCE_SSL=false
-APP_FORCE_ROOT=
+APP_NAME=FireflyIII
 APP_KEY=${FF_APP_KEY}
 APP_LOG=daily
 APP_LOG_LEVEL=warning
@@ -28,7 +27,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379

 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -41,6 +40,8 @@ SHOW_INCOMPLETE_TRANSLATIONS=false

 CACHE_PREFIX=firefly

+EXCHANGE_RATE_SERVICE=fixerio
+
 GOOGLE_MAPS_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
@@ -48,7 +49,7 @@ USE_ENCRYPTION=true

 PUSHER_KEY=
 PUSHER_SECRET=
-PUSHER_APP_ID=
+PUSHER_ID=

 DEMO_USERNAME=
 DEMO_PASSWORD=
--- a/.env.example
+++ b/.env.example
@@ -1,11 +1,11 @@
-APP_ENV=production
+APP_ENV=local
 APP_DEBUG=false
-APP_FORCE_SSL=false
-APP_FORCE_ROOT=
+APP_NAME=FireflyIII
 APP_KEY=SomeRandomStringOf32CharsExactly
 APP_LOG=daily
 APP_LOG_LEVEL=warning
 APP_URL=http://localhost
+TRUSTED_PROXIES=

 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
@@ -28,7 +28,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379

 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -43,14 +43,14 @@ CACHE_PREFIX=firefly

 EXCHANGE_RATE_SERVICE=fixerio

-GOOGLE_MAPS_API_KEY=
+MAPBOX_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
 USE_ENCRYPTION=true

 PUSHER_KEY=
 PUSHER_SECRET=
-PUSHER_APP_ID=
+PUSHER_ID=

 DEMO_USERNAME=
 DEMO_PASSWORD=
--- a/.env.sandstorm
+++ b/.env.sandstorm
@@ -1,7 +1,6 @@
 APP_ENV=production
 APP_DEBUG=true
-APP_FORCE_SSL=false
-APP_FORCE_ROOT=
+APP_NAME=FireflyIII
 APP_KEY=SomeRandomStringOf32CharsExactly
 APP_LOG=syslog
 APP_LOG_LEVEL=debug
@@ -28,7 +27,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379

 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -41,6 +40,8 @@ SHOW_INCOMPLETE_TRANSLATIONS=false

 CACHE_PREFIX=firefly

+EXCHANGE_RATE_SERVICE=fixerio
+
 GOOGLE_MAPS_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
@@ -48,8 +49,7 @@ USE_ENCRYPTION=true

 PUSHER_KEY=
 PUSHER_SECRET=
-PUSHER_APP_ID=
+PUSHER_ID=

 DEMO_USERNAME=
 DEMO_PASSWORD=
-
--- a/.env.testing
+++ b/.env.testing
@@ -1,7 +1,6 @@
 APP_ENV=testing
 APP_DEBUG=true
-APP_FORCE_SSL=false
-APP_FORCE_ROOT=
+APP_NAME=FireflyIII
 APP_KEY=TestTestTestTestTestTestTestTest
 APP_LOG=daily
 APP_LOG_LEVEL=debug
@@ -11,7 +10,7 @@ DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_PASSWORD=

 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -26,8 +25,8 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379

-MAIL_DRIVER=log
-MAIL_HOST=mailtrap.io
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -38,9 +37,19 @@ SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
 SHOW_INCOMPLETE_TRANSLATIONS=false

+CACHE_PREFIX=firefly
+
+EXCHANGE_RATE_SERVICE=fixerio
+
+GOOGLE_MAPS_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true

 PUSHER_KEY=
 PUSHER_SECRET=
-PUSHER_APP_ID=
+PUSHER_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 * text=auto
 *.css linguist-vendored
 *.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,14 +6,6 @@

 I am always interested in expanding Firefly III's many features. If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/).

-## Bugs
-
-First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://firefly-iii.nder.be/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority! 
-
-## Installation problems
-
-Please take the time to read the [installation guide FAQ](https://firefly-iii.github.io/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can.
-
 ## Pull requests

 When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `master` branch.
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -0,0 +1,11 @@
+# Welcome to Firefly III on Github!
+
+:+1::tada: Thank you for taking the time to contribute something to Firefly III!
+
+## Bugs
+
+First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://firefly-iii.nder.be/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority! 
+
+## Installation problems
+
+Please take the time to read the [installation guide FAQ](https://firefly-iii.github.io/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can.
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,14 @@
 /node_modules
+/public/hot
 /public/storage
+/storage/*.key
 /vendor
+/.vagrant
 Homestead.json
 Homestead.yaml
+npm-debug.log
+yarn-error.log
 .env
 public/google*.html
+report.html
+composer.phar
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: php
 php:
-  - 7.0
  - 7.1

 cache:
@@ -20,10 +19,10 @@ install:
  - mkdir -p build/logs

 script:
-  - phpunit -c phpunit.xml
+  - phpunit -c phpunit.coverage.xml

-#after_success:
-#  - travis_retry php vendor/bin/coveralls -x storage/build/clover.xml
+after_success:
+  - travis_retry php vendor/bin/coveralls -x storage/build/clover-all.xml

 # safelist
 branches:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,180 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## [4.6.8] - 2017-10-15
+### Added
+- Verify routine will check if deposits have a budget (they shouldn't).
+- New translations!
+
+### Changed
+- Changed docker files for [issue 919](https://github.com/firefly-iii/firefly-iii/issues/919) and [issue 915](https://github.com/firefly-iii/firefly-iii/issues/915)
+
+### Fixed
+- [Issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), as reported by [Wr0ngName](https://github.com/Wr0ngName)
+- Rules can no longer set a budget for a transfer or a deposit ([issue 916](https://github.com/firefly-iii/firefly-iii/issues/916))
+- Fixed [issue 925](https://github.com/firefly-iii/firefly-iii/issues/925), [issue 928](https://github.com/firefly-iii/firefly-iii/issues/928) as reported by [dzaikos](https://github.com/dzaikos) and [DeltaKiloz](https://github.com/DeltaKiloz)
+- A fix for [issue 926](https://github.com/firefly-iii/firefly-iii/issues/926), as reported by [Aquariu](https://github.com/Aquariu)
+
+## [4.6.7] - 2017-10-09
+### Added
+- [Issue 872](https://github.com/firefly-iii/firefly-iii/issues/872), reported [gavu](https://github.com/gavu)
+
+### Fixed
+- [Issue 878](https://github.com/firefly-iii/firefly-iii/issues/878), fixed by [Findus23](https://github.com/Findus23)
+- [Issue 881](https://github.com/firefly-iii/firefly-iii/issues/881), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 884](https://github.com/firefly-iii/firefly-iii/issues/884), by [gavu](https://github.com/gavu)
+- [Issue 840](https://github.com/firefly-iii/firefly-iii/issues/840), reported by [MacPaille](https://github.com/MacPaille)
+- [Issue 882](https://github.com/firefly-iii/firefly-iii/issues/882), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), [issue 892](https://github.com/firefly-iii/firefly-iii/issues/892), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), reported by [gavu](https://github.com/gavu)
+- [Issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), fixed by [pkoziol](https://github.com/pkoziol)
+- [Issue 903](https://github.com/firefly-iii/firefly-iii/issues/903), fixed by [hduijn](https://github.com/hduijn)
+- [Issue 904](https://github.com/firefly-iii/firefly-iii/issues/904), reported by [gavu](https://github.com/gavu)
+- [Issue 910](https://github.com/firefly-iii/firefly-iii/issues/910), reported by [gavu](https://github.com/gavu)
+- [Issue 911](https://github.com/firefly-iii/firefly-iii/issues/911), reported by [gavu](https://github.com/gavu)
+- [Issue 915](https://github.com/firefly-iii/firefly-iii/issues/915), reported by [TomWis97](https://github.com/TomWis97)
+- [Issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), reported by [Wr0ngName](https://github.com/Wr0ngName)
+
+## [4.6.6] - 2017-09-30
+### Added
+- [Issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol).
+- [Issue 855](https://github.com/firefly-iii/firefly-iii/issues/855), by [ms32035](https://github.com/ms32035)
+- [Issue 786](https://github.com/firefly-iii/firefly-iii/issues/786), by [SmilingWorlock](https://github.com/SmilingWorlock)
+- [Issue 875](https://github.com/firefly-iii/firefly-iii/issues/875), by [gavu](https://github.com/gavu)
+- [Issue 834](https://github.com/firefly-iii/firefly-iii/issues/834), by [gavu](https://github.com/gavu) (and others)
+
+
+### Changed
+- Upgraded to Laravel 5.5
+- Add version parameter to CSS and JS files
+- [Issue 823](https://github.com/firefly-iii/firefly-iii/issues/823), [issue 824](https://github.com/firefly-iii/firefly-iii/issues/824) fixed Docker config by [DieBauer](https://github.com/DieBauer)
+
+### Fixed
+- [Issue 830](https://github.com/firefly-iii/firefly-iii/issues/830)
+- [Issue 822](https://github.com/firefly-iii/firefly-iii/issues/822), reported by [gazben](https://github.com/gazben)
+- [Issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 835](https://github.com/firefly-iii/firefly-iii/issues/835), reported by [gavu](https://github.com/gavu)
+- [Issue 836](https://github.com/firefly-iii/firefly-iii/issues/836), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 838](https://github.com/firefly-iii/firefly-iii/issues/838), reported by [gavu](https://github.com/gavu)
+- [Issue 839](https://github.com/firefly-iii/firefly-iii/issues/839), reported by [gavu](https://github.com/gavu)
+- [Issue 843](https://github.com/firefly-iii/firefly-iii/issues/843), reported by [gavu](https://github.com/gavu)
+- [Issue 837](https://github.com/firefly-iii/firefly-iii/issues/837), reported by [gavu](https://github.com/gavu)
+- [Issue 845](https://github.com/firefly-iii/firefly-iii/issues/845), reported by [gavu](https://github.com/gavu)
+- [Issue 846](https://github.com/firefly-iii/firefly-iii/issues/846), reported by [gavu](https://github.com/gavu)
+- [Issue 848](https://github.com/firefly-iii/firefly-iii/issues/848), reported by [gavu](https://github.com/gavu)
+- [Issue 854](https://github.com/firefly-iii/firefly-iii/issues/854), reported by [gavu](https://github.com/gavu)
+- [Issue 866](https://github.com/firefly-iii/firefly-iii/issues/866), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 847](https://github.com/firefly-iii/firefly-iii/issues/847), reported by [gavu](https://github.com/gavu)
+- [Issue 853](https://github.com/firefly-iii/firefly-iii/issues/853), reported by [gavu](https://github.com/gavu)
+- [Issue 857](https://github.com/firefly-iii/firefly-iii/issues/857), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 865](https://github.com/firefly-iii/firefly-iii/issues/865), reported by [simonsmiley](https://github.com/simonsmiley)
+- [Issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 856](https://github.com/firefly-iii/firefly-iii/issues/856), reported by [ms32035](https://github.com/ms32035)
+- [Issue 860](https://github.com/firefly-iii/firefly-iii/issues/860), reported by [gavu](https://github.com/gavu)
+- [Issue 861](https://github.com/firefly-iii/firefly-iii/issues/861), reported by [gavu](https://github.com/gavu)
+- [Issue 870](https://github.com/firefly-iii/firefly-iii/issues/870), reported by [gavu](https://github.com/gavu)
+
+## [4.6.5] - 2017-09-09
+
+### Added
+- [Issue 616](https://github.com/firefly-iii/firefly-iii/issues/616), The ability to link transactions
+- [Issue 763](https://github.com/firefly-iii/firefly-iii/issues/763), as suggested by [tannie](https://github.com/tannie)
+- [Issue 770](https://github.com/firefly-iii/firefly-iii/issues/770), as suggested by [skibbipl](https://github.com/skibbipl)
+- [Issue 780](https://github.com/firefly-iii/firefly-iii/issues/780), as suggested by [skibbipl](https://github.com/skibbipl)
+- [Issue 784](https://github.com/firefly-iii/firefly-iii/issues/784), as suggested by [SmilingWorlock](https://github.com/SmilingWorlock)
+- Lots of code for future support of automated Bunq imports
+
+### Changed
+- Rewrote the export routine
+- [Issue 782](https://github.com/firefly-iii/firefly-iii/issues/782), as suggested by [NiceGuyIT](https://github.com/NiceGuyIT)
+- [Issue 800](https://github.com/firefly-iii/firefly-iii/issues/800), as suggested by [jleeong](https://github.com/jleeong)
+
+### Fixed
+- [Issue 724](https://github.com/firefly-iii/firefly-iii/issues/724), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 738](https://github.com/firefly-iii/firefly-iii/issues/738), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 760](https://github.com/firefly-iii/firefly-iii/issues/760), reported by [leander091](https://github.com/leander091)
+- [Issue 764](https://github.com/firefly-iii/firefly-iii/issues/764), reported by [tannie](https://github.com/tannie)
+- [Issue 792](https://github.com/firefly-iii/firefly-iii/issues/792), reported by [jleeong](https://github.com/jleeong)
+- [Issue 793](https://github.com/firefly-iii/firefly-iii/issues/793), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 797](https://github.com/firefly-iii/firefly-iii/issues/797), reported by [leander091](https://github.com/leander091)
+- [Issue 801](https://github.com/firefly-iii/firefly-iii/issues/801), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 803](https://github.com/firefly-iii/firefly-iii/issues/803), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 805](https://github.com/firefly-iii/firefly-iii/issues/805), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 806](https://github.com/firefly-iii/firefly-iii/issues/806), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 807](https://github.com/firefly-iii/firefly-iii/issues/807), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 808](https://github.com/firefly-iii/firefly-iii/issues/808), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 809](https://github.com/firefly-iii/firefly-iii/issues/809), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 814](https://github.com/firefly-iii/firefly-iii/issues/814), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 818](https://github.com/firefly-iii/firefly-iii/issues/818), reported by [gavu](https://github.com/gavu)
+- [Issue 819](https://github.com/firefly-iii/firefly-iii/issues/819), reported by [DieBauer](https://github.com/DieBauer)
+- [Issue 820](https://github.com/firefly-iii/firefly-iii/issues/820), reported by [simonsmiley](https://github.com/simonsmiley) 
+- Various other fixes
+
+
+## [4.6.4] - 2017-08-13
+### Added
+- PHP7.1 support
+- Routine to decrypt attachments from the command line, for [issue 671](https://github.com/firefly-iii/firefly-iii/issues/671)
+- A routine that can check if your password has been stolen in the past.
+- Split transaction shows amount left to be split
+
+
+### Changed
+- Importer can (potentially) handle new import routines such as banks.
+- Importer can fall back from JSON errors 
+
+### Removed
+- PHP7.0 support
+- Support for extended tag modes
+- Remove "time jumps" to non-empty periods
+
+
+### Fixed
+- [Issue 717](https://github.com/firefly-iii/firefly-iii/issues/717), reported by [NiceGuyIT](https://github.com/NiceGuyIT)
+- [Issue 718](https://github.com/firefly-iii/firefly-iii/issues/718), reported by [wtercato](https://github.com/wtercato)
+- [Issue 722](https://github.com/firefly-iii/firefly-iii/issues/722), reported by [simonsmiley](https://github.com/simonsmiley)
+- [Issue 648](https://github.com/firefly-iii/firefly-iii/issues/648), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 730](https://github.com/firefly-iii/firefly-iii/issues/730), reported by [ragnarkarlsson](https://github.com/ragnarkarlsson)
+- [Issue 733](https://github.com/firefly-iii/firefly-iii/issues/733), reported by [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 735](https://github.com/firefly-iii/firefly-iii/issues/735), reported by [kristophr](https://github.com/kristophr)
+- [Issue 739](https://github.com/firefly-iii/firefly-iii/issues/739), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 515](https://github.com/firefly-iii/firefly-iii/issues/515), reported by [schwalberich](https://github.com/schwalberich)
+- [Issue 743](https://github.com/firefly-iii/firefly-iii/issues/743), reported by [simonsmiley](https://github.com/simonsmiley)
+- [Issue 746](https://github.com/firefly-iii/firefly-iii/issues/746), reported by [tannie](https://github.com/tannie)
+- [Issue 747](https://github.com/firefly-iii/firefly-iii/issues/747), reported by [tannie](https://github.com/tannie)
+
+
+## [4.6.3.1] - 2017-07-23
+### Fixed
+- Hotfix to close [issue 715](https://github.com/firefly-iii/firefly-iii/issues/715)
+
+## [4.6.3] - 2017-07-23
+
+This will be the last release to support PHP 7.0.
+
+### Added
+- New guidelines and new introduction tour to aid new users.
+- Rules can now be applied at will to transactions, not just rule groups.
+
+### Changed
+- Improved category overview.
+- Improved budget overview.
+- Improved budget report.
+- Improved command line import responsiveness and speed.
+- All code comparisons are now strict.
+- Improve search page.
+- Charts are easier to read thanks to [simonsmiley](https://github.com/simonsmiley)
+- Fixed [issue 708](https://github.com/firefly-iii/firefly-iii/issues/708).
+
+### Fixed
+- Fixed bug where import would not respect default account. [issue 694](https://github.com/firefly-iii/firefly-iii/issues/694)
+- Fixed various broken paths
+- Fixed several import inconsistencies.
+- Various bug fixes.
+
 ## [4.6.2] - 2017-07-08
 ### Added
- Links added to boxes, idea by @simonsmiley
+- Links added to boxes, idea by [simonsmiley](https://github.com/simonsmiley)

 ### Fixed
 - Various bugs in import routine
@@ -19,11 +190,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Revamped import routine. Will be buggy.

 ### Fixed
- Issue #667, postgresql reported by @skibbipl.
- Issue #680 by @Xeli
- Fixed #660
- Fixes #672, reported by @dzaikos
- Translation error fixed by 
+- [Issue 667](https://github.com/firefly-iii/firefly-iii/issues/667), postgresql reported by [skibbipl](https://github.com/skibbipl).
+- [Issue 680](https://github.com/firefly-iii/firefly-iii/issues/680), fixed by [Xeli](https://github.com/Xeli)
+- Fixed [issue 660](https://github.com/firefly-iii/firefly-iii/issues/660)
+- Fixes [issue 672](https://github.com/firefly-iii/firefly-iii/issues/672), reported by [dzaikos](https://github.com/dzaikos)
 - Fix a bug where the balance routine forgot to account for accounts without a currency preference.
 - Various other bugfixes.

@@ -33,11 +203,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Better support for multi-currency transactions and display of transactions, accounts and everything. This requires a database overhaul (moving the currency information to specific transactions) so be careful when upgrading.
 - Translations for Spanish and Slovenian.
 - New interface for budget page, ~~stolen from~~ inspired by YNAB.
- Expanded Docker to work with postgresql as well, thanks to @kressh
+- Expanded Docker to work with postgresql as well, thanks to [kressh](https://github.com/kressh)

 ### Fixed
- PostgreSQL support in database upgrade routine (#644, reported by @skibbipl)
- Frontpage budget chart was off, fix by @nhaarman
+- PostgreSQL support in database upgrade routine ([issue 644](https://github.com/firefly-iii/firefly-iii/issues/644), reported by [skibbipl](https://github.com/skibbipl))
+- Frontpage budget chart was off, fix by [nhaarman](https://github.com/nhaarman)
 - Was not possible to remove opening balance.

 ## [4.4.3] - 2017-05-03
@@ -52,8 +222,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - The journal collector, an internal piece of code to collect transactions, now uses a slightly different method of collecting journals. This may cause problems.

 ### Fixed
- Issue #638 as reported by [worldworm](https://github.com/worldworm).
- Possible fix for #624
+- [Issue 638](https://github.com/firefly-iii/firefly-iii/issues/638) as reported by [worldworm](https://github.com/worldworm).
+- Possible fix for [issue 624](https://github.com/firefly-iii/firefly-iii/issues/624)

 ## [4.4.2] - 2017-04-27
 ### Fixed
@@ -70,24 +240,24 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [4.4.0] - 2017-04-23
 ### Added
 - Firefly III can now handle foreign currencies better, including some code to get the exchange rate live from the web.
- Can now make rules for attachments, see #608, as suggested by dzaikos.
+- Can now make rules for attachments, see [issue 608](https://github.com/firefly-iii/firefly-iii/issues/608), as suggested by [dzaikos](https://github.com/dzaikos).

 ### Fixed
- Fixed #629, reported by forcaeluz
- Fixed #630, reported by welbert
+- Fixed [issue 629](https://github.com/firefly-iii/firefly-iii/issues/629), reported by forcaeluz
+- Fixed [issue 630](https://github.com/firefly-iii/firefly-iii/issues/630), reported by welbert
 - And more various bug fixes.

 ## [4.3.8] - 2017-04-08

 ### Added
 - Better overview / show pages.
- #628, as reported by [xzaz](https://github.com/xzaz).
+- [Issue 628](https://github.com/firefly-iii/firefly-iii/issues/628), as reported by [xzaz](https://github.com/xzaz).
 - Greatly expanded test coverage

 ### Fixed
- #619, as reported by [dfiel](https://github.com/dfiel).
- #620, as reported by [forcaeluz](https://github.com/forcaeluz).
- Attempt to fix #624, as reported by [TheSerenin](https://github.com/TheSerenin).
+- [Issue 619](https://github.com/firefly-iii/firefly-iii/issues/619), as reported by [dfiel](https://github.com/dfiel).
+- [Issue 620](https://github.com/firefly-iii/firefly-iii/issues/620), as reported by [forcaeluz](https://github.com/forcaeluz).
+- Attempt to fix [issue 624](https://github.com/firefly-iii/firefly-iii/issues/624), as reported by [TheSerenin](https://github.com/TheSerenin).
 - Favicon link is relative now, fixed by [welbert](https://github.com/welbert).
 - Some search bugs

@@ -105,61 +275,61 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Slightly changed account overview.

 ### Removed
- Removed IDE specific views from .gitignore, issue #598
+- Removed IDE specific views from .gitignore, [issue 598](https://github.com/firefly-iii/firefly-iii/issues/598)

 ### Fixed
 - Force key generation during installation.
 - The `date` function takes the fieldname where a date is stored, not the literal date by [Zsub](https://github.com/Zsub)
 - Improved budget frontpage chart, as suggested by [skibbipl](https://github.com/skibbipl)
- Issue #602 and #607, as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos).
- Issue #605, as reported by [Zsub](https://github.com/Zsub).
- Issue #599, as reported by [leander091](https://github.com/leander091).
- Issue #610, as reported by [skibbipl](https://github.com/skibbipl).
- Issue #611, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
- Issue #612, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
- Issue #614, as reported by [worldworm](https://github.com/worldworm).
+- [Issue 602](https://github.com/firefly-iii/firefly-iii/issues/602) and [issue 607](https://github.com/firefly-iii/firefly-iii/issues/607), as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos).
+- [Issue 605](https://github.com/firefly-iii/firefly-iii/issues/605), as reported by [Zsub](https://github.com/Zsub).
+- [Issue 599](https://github.com/firefly-iii/firefly-iii/issues/599), as reported by [leander091](https://github.com/leander091).
+- [Issue 610](https://github.com/firefly-iii/firefly-iii/issues/610), as reported by [skibbipl](https://github.com/skibbipl).
+- [Issue 611](https://github.com/firefly-iii/firefly-iii/issues/611), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
+- [Issue 612](https://github.com/firefly-iii/firefly-iii/issues/612), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
+- [Issue 614](https://github.com/firefly-iii/firefly-iii/issues/614), as reported by [worldworm](https://github.com/worldworm).
 - Various other bug fixes.

 ## [4.3.6] - 2017-02-20
 ### Fixed
- #578, reported by [xpfgsyb](https://github.com/xpfgsyb).
+- [Issue 578](https://github.com/firefly-iii/firefly-iii/issues/578), reported by [xpfgsyb](https://github.com/xpfgsyb).

 ## [4.3.5] - 2017-02-19
 ### Added
 - Beta support for Sandstorm.IO
- Docker support by [@schoentoon](https://github.com/schoentoon), [@elohmeier](https://github.com/elohmeier), [@patrickkostjens](https://github.com/patrickkostjens) and [@crash7](https://github.com/crash7)!
+- Docker support by [schoentoon](https://github.com/schoentoon), [elohmeier](https://github.com/elohmeier), [patrickkostjens](https://github.com/patrickkostjens) and [crash7](https://github.com/crash7)!
 - Can now use special keywords in the search to search for specic dates, categories, etc.

 ### Changed
 - Updated to laravel 5.4!
 - User friendly error message
- Updated locales to support more operating systems, first reported in #536 by [dabenzel](https://github.com/dabenzel)
+- Updated locales to support more operating systems, first reported in [issue 536](https://github.com/firefly-iii/firefly-iii/issues/536) by [dabenzel](https://github.com/dabenzel)
 - Updated budget report
 - Improved 404 page
 - Smooth curves, improved by [elamperti](https://github.com/elamperti).

 ### Fixed
- #549
- #553
- Fixed #559 reported by [elamperti](https://github.com/elamperti).
- #565, as reported by a user over the mail
- #566, as reported by [dspeckmann](https://github.com/dspeckmann)
- #567, as reported by [winsomniak](https://github.com/winsomniak)
- #569, as reported by [winsomniak](https://github.com/winsomniak)
- #572, as reported by [zjean](https://github.com/zjean)
+- [Issue 549](https://github.com/firefly-iii/firefly-iii/issues/549)
+- [Issue 553](https://github.com/firefly-iii/firefly-iii/issues/553)
+- Fixed [issue 559](https://github.com/firefly-iii/firefly-iii/issues/559) reported by [elamperti](https://github.com/elamperti).
+- [Issue 565](https://github.com/firefly-iii/firefly-iii/issues/565), as reported by a user over the mail
+- [Issue 566](https://github.com/firefly-iii/firefly-iii/issues/566), as reported by [dspeckmann](https://github.com/dspeckmann)
+- [Issue 567](https://github.com/firefly-iii/firefly-iii/issues/567), as reported by [winsomniak](https://github.com/winsomniak)
+- [Issue 569](https://github.com/firefly-iii/firefly-iii/issues/569), as reported by [winsomniak](https://github.com/winsomniak)
+- [Issue 572](https://github.com/firefly-iii/firefly-iii/issues/572), as reported by [zjean](https://github.com/zjean)
 - Many issues with the transaction filters which will fix reports (they tended to display the wrong amount).

 ## [4.3.4] - 2017-02-02
 ### Fixed
- Fixed bug #550, reported by [worldworm](https://github.com/worldworm)!
- Fixed bug #551, reported by [t-me](https://github.com/t-me)!
+- Fixed bug [issue 550](https://github.com/firefly-iii/firefly-iii/issues/550), reported by [worldworm](https://github.com/worldworm)!
+- Fixed bug [issue 551](https://github.com/firefly-iii/firefly-iii/issues/551), reported by [t-me](https://github.com/t-me)!

 ## [4.3.3] - 2017-01-30

 _The 100th release of Firefly!_

 ### Added
- Add locales to Docker (#534) by [elohmeier](https://github.com/elohmeier).
+- Add locales to Docker ([issue 534](https://github.com/firefly-iii/firefly-iii/issues/534)) by [elohmeier](https://github.com/elohmeier).
 - Optional database encryption. On by default.
 - Datepicker for Firefox and other browsers.
 - New instruction block for updating and installing.
@@ -182,7 +352,7 @@ _The 100th release of Firefly!_
 An intermediate release because something in the Twig and Twigbridge libraries is broken and I have to make sure it doesn't affect you guys. But some cool features were on their way so there's that oo.

 ### Added
- Some code for issue #475, consistent overviews.
+- Some code for [issue 475](https://github.com/firefly-iii/firefly-iii/issues/475), consistent overviews.
 - Better currency display. Make sure you have locale packages installed.

 ### Changed
@@ -190,56 +360,56 @@ An intermediate release because something in the Twig and Twigbridge libraries i

 ### Fixed
 - The password reset routine was broken.
- Issue #522, thanks to [xpfgsyb](https://github.com/xpfgsyb)
- Issue #524, thanks to [worldworm](https://github.com/worldworm)
- Issue #526, thanks to [worldworm](https://github.com/worldworm)
- Issue #528, thanks to [skibbipl](https://github.com/skibbipl)
+- [Issue 522](https://github.com/firefly-iii/firefly-iii/issues/522), thanks to [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 524](https://github.com/firefly-iii/firefly-iii/issues/524), thanks to [worldworm](https://github.com/worldworm)
+- [Issue 526](https://github.com/firefly-iii/firefly-iii/issues/526), thanks to [worldworm](https://github.com/worldworm)
+- [Issue 528](https://github.com/firefly-iii/firefly-iii/issues/528), thanks to [skibbipl](https://github.com/skibbipl)
 - Various other fixes.

 ## [4.3.1] - 2017-01-04
 ### Added
 - Support for Russian and Polish. 
 - Support for a proper demo website.
- Support for custom decimal places in currencies (#506, suggested by [xpfgsyb](https://github.com/xpfgsyb)).
- Most amounts are now right-aligned (#511, suggested by [xpfgsyb](https://github.com/xpfgsyb)).
+- Support for custom decimal places in currencies ([issue 506](https://github.com/firefly-iii/firefly-iii/issues/506), suggested by [xpfgsyb](https://github.com/xpfgsyb)).
+- Most amounts are now right-aligned ([issue 511](https://github.com/firefly-iii/firefly-iii/issues/511), suggested by [xpfgsyb](https://github.com/xpfgsyb)).
 - German is now a "complete" language, more than 75% translated!

 ### Changed
 - **[New Github repository!](github.com/firefly-iii/firefly-iii)**
 - Better category overview.
- #502, thanks to [zjean](https://github.com/zjean)
+- [Issue 502](https://github.com/firefly-iii/firefly-iii/issues/502), thanks to [zjean](https://github.com/zjean)

 ### Removed
 - Removed a lot of administration functions.
 - Removed ability to activate users.

 ### Fixed
- #501, thanks to [zjean](https://github.com/zjean)
- #513, thanks to [skibbipl](https://github.com/skibbipl) 
+- [Issue 501](https://github.com/firefly-iii/firefly-iii/issues/501), thanks to [zjean](https://github.com/zjean)
+- [Issue 513](https://github.com/firefly-iii/firefly-iii/issues/513), thanks to [skibbipl](https://github.com/skibbipl) 

 ### Security
- #519, thanks to [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 519](https://github.com/firefly-iii/firefly-iii/issues/519), thanks to [xpfgsyb](https://github.com/xpfgsyb)

-## [4.3.0] - 2015-12-26
+## [4.3.0] - 2016-12-26
 ### Added
- New method of keeping track of available budget, see issue #489
+- New method of keeping track of available budget, see [issue 489](https://github.com/firefly-iii/firefly-iii/issues/489)
 - Support for Spanish
 - Firefly III now has an extended demo mode. Will expand further in the future.
 

 ### Changed
 - New favicon
- Import routine no longer gives transactions a description #483
+- Import routine no longer gives transactions a description [issue 483](https://github.com/firefly-iii/firefly-iii/issues/483)


 ### Removed
 - All test data generation code.

 ### Fixed
- Removed import accounts from search results #478
- Redirect after delete will no longer go back to deleted item #477
- Cannot math #482
- Fixed bug in virtual balance field #479
+- Removed import accounts from search results [issue 478](https://github.com/firefly-iii/firefly-iii/issues/478)
+- Redirect after delete will no longer go back to deleted item [issue 477](https://github.com/firefly-iii/firefly-iii/issues/477)
+- Cannot math [issue 482](https://github.com/firefly-iii/firefly-iii/issues/482)
+- Fixed bug in virtual balance field [issue 479](https://github.com/firefly-iii/firefly-iii/issues/479)

 ## [4.2.2] - 2016-12-18
 ### Added
@@ -251,25 +421,25 @@ An intermediate release because something in the Twig and Twigbridge libraries i

 ### Fixed
 - Various bugs
- Issue #472 thanks to [zjean](https://github.com/zjean)
+- [Issue 472](https://github.com/firefly-iii/firefly-iii/issues/472) thanks to [zjean](https://github.com/zjean)

 ## [4.2.1] - 2016-12-09
 ### Added
- BIC support (see #430)
+- BIC support (see [issue 430](https://github.com/firefly-iii/firefly-iii/issues/430))
 - New category report section and chart (see the general financial report)


 ### Changed
- Date range picker now also available on mobile devices (see #435)
- Extended range of amounts for issue #439
+- Date range picker now also available on mobile devices (see [issue 435](https://github.com/firefly-iii/firefly-iii/issues/435))
+- Extended range of amounts for [issue 439](https://github.com/firefly-iii/firefly-iii/issues/439)
 - Rewrote all routes. Old bookmarks may break.

 ## [4.2.0] - 2016-11-27
 ### Added
 - Lots of (empty) tests
- Expanded transaction lists (#377)
+- Expanded transaction lists ([issue 377](https://github.com/firefly-iii/firefly-iii/issues/377))
 - New charts at account view
- First code for #305
+- First code for [issue 305](https://github.com/firefly-iii/firefly-iii/issues/305)


 ### Changed
@@ -277,12 +447,12 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Made some fonts local

 ### Fixed
- Issue #408
+- [Issue 408](https://github.com/firefly-iii/firefly-iii/issues/408)
 - Various issues with split journals
- Issue #414, thx [zjean](https://github.com/zjean)
- Issue #419, thx [schwalberich](https://github.com/schwalberich) 
- Issue #422, thx [xzaz](https://github.com/xzaz)
- Various import bugs, such as #416 ([zjean](https://github.com/zjean))
+- [Issue 414](https://github.com/firefly-iii/firefly-iii/issues/414), thx [zjean](https://github.com/zjean)
+- [Issue 419](https://github.com/firefly-iii/firefly-iii/issues/419), thx [schwalberich](https://github.com/schwalberich) 
+- [Issue 422](https://github.com/firefly-iii/firefly-iii/issues/422), thx [xzaz](https://github.com/xzaz)
+- Various import bugs, such as [issue 416](https://github.com/firefly-iii/firefly-iii/issues/416) ([zjean](https://github.com/zjean))

 ## [4.1.7] - 2016-11-19
 ### Added
@@ -299,9 +469,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i

 ### Fixed
 - Made all pages more mobile friendly.
- Fixed #395 found by [marcoveeneman](https://github.com/marcoveeneman).
- Fixed #398 found by [marcoveeneman](https://github.com/marcoveeneman).
- Fixed #401 found by [marcoveeneman](https://github.com/marcoveeneman).
+- Fixed [issue 395](https://github.com/firefly-iii/firefly-iii/issues/395) found by [marcoveeneman](https://github.com/marcoveeneman).
+- Fixed [issue 398](https://github.com/firefly-iii/firefly-iii/issues/398) found by [marcoveeneman](https://github.com/marcoveeneman).
+- Fixed [issue 401](https://github.com/firefly-iii/firefly-iii/issues/401) found by [marcoveeneman](https://github.com/marcoveeneman).
 - Many optimizations.
 - Updated many libraries.
 - Various bugs found by myself.
@@ -317,9 +487,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Rebuilt seach engine.

 ### Fixed
- #375, thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies.
- #370 thanks to [ksmolder](https://github.com/ksmolder)
- #378, thanks to [HomelessAvatar](https://github.com/HomelessAvatar)
+- [Issue 375](https://github.com/firefly-iii/firefly-iii/issues/375), thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies.
+- [Issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) thanks to [ksmolder](https://github.com/ksmolder)
+- [Issue 378](https://github.com/firefly-iii/firefly-iii/issues/378), thanks to [HomelessAvatar](https://github.com/HomelessAvatar)

 ## [4.1.5] - 2016-11-01
 ### Changed
@@ -328,7 +498,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Help content is translated through Crowdin.

 ### Fixed
- Issue #370
+- [Issue 370](https://github.com/firefly-iii/firefly-iii/issues/370)

 ## [4.1.4] - 2016-10-30
 ### Added
@@ -345,10 +515,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Change error message to refer to solution.

 ### Fixed
- #367 thanks to [HungryFeline](https://github.com/HungryFeline)
- #366 thanks to [3mz3t](https://github.com/3mz3t)
- #362 and #341 thanks to [bnw](https://github.com/bnw)
- #355 thanks to [roberthorlings](https://github.com/roberthorlings)
+- [Issue 367](https://github.com/firefly-iii/firefly-iii/issues/367) thanks to [HungryFeline](https://github.com/HungryFeline)
+- [Issue 366](https://github.com/firefly-iii/firefly-iii/issues/366) thanks to [3mz3t](https://github.com/3mz3t)
+- [Issue 362](https://github.com/firefly-iii/firefly-iii/issues/362) and [issue 341](https://github.com/firefly-iii/firefly-iii/issues/341) thanks to [bnw](https://github.com/bnw)
+- [Issue 355](https://github.com/firefly-iii/firefly-iii/issues/355) thanks to [roberthorlings](https://github.com/roberthorlings)

 ## [4.1.3] - 2016-10-22
 ### Fixed
@@ -379,7 +549,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Lots of old code

 ### Fixed
- #357, where non utf-8 files would break Firefly.
+- [Issue 357](https://github.com/firefly-iii/firefly-iii/issues/357), where non utf-8 files would break Firefly.
 - Tab delimiter is not properly loaded from import configuration ([roberthorlings](https://github.com/roberthorlings))
 - System response to yearly bills

@@ -390,9 +560,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i

 ### Changed
 - Updated all copyright notices to refer to the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)
- Fixed #344
- Fixed #346, thanks to [SanderKleykens](https://github.com/SanderKleykens)
- #351
+- Fixed [issue 344](https://github.com/firefly-iii/firefly-iii/issues/344)
+- Fixed [issue 346](https://github.com/firefly-iii/firefly-iii/issues/346), thanks to [SanderKleykens](https://github.com/SanderKleykens)
+- [Issue 351](https://github.com/firefly-iii/firefly-iii/issues/351)
 - Did some internal remodelling.

 ### Fixed
@@ -403,17 +573,17 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 ## [4.0.1] - 2016-10-04
 ### Added
 - New ING import specific by [tomwerf](https://github.com/tomwerf)
- New Presidents Choice specific to fix #307
- Added some trimming (#335)
+- New Presidents Choice specific to fix [issue 307](https://github.com/firefly-iii/firefly-iii/issues/307)
+- Added some trimming ([issue 335](https://github.com/firefly-iii/firefly-iii/issues/335))

 ### Fixed
 - Fixed a bug where incoming transactions would not be properly filtered in several reports.
- #334 by [cyberkov](https://github.com/cyberkov)
- #337
- #336
- #338 found by [roberthorlings](https://github.com/roberthorlings)
+- [Issue 334](https://github.com/firefly-iii/firefly-iii/issues/334) by [cyberkov](https://github.com/cyberkov)
+- [Issue 337](https://github.com/firefly-iii/firefly-iii/issues/337)
+- [Issue 336](https://github.com/firefly-iii/firefly-iii/issues/336)
+- [Issue 338](https://github.com/firefly-iii/firefly-iii/issues/338) found by [roberthorlings](https://github.com/roberthorlings)

-## [4.0.0] - 2015-09-26
+## [4.0.0] - 2016-09-26
 ### Added
 - Upgraded to Laravel 5.3, most other libraries upgraded as well.
 - Added GBP as currency, thanks to [Mortalife](https://github.com/Mortalife)
@@ -428,7 +598,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Various bugs, thanks to [fuf](https://github.com/fuf), [sandermulders](https://github.com/sandermulders) and [vissert](https://github.com/vissert)
 - Various queries optimized for MySQL 5.7

-## [3.10.4] - 2015-09-14
+## [3.10.4] - 2016-09-14
 ### Fixed
 - Migration fix by [sandermulders](https://github.com/sandermulders)
 - Tricky import bug fix thanks to [vissert](https://github.com/vissert)
@@ -438,7 +608,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i

 ## [3.10.3] - 2016-08-29
 ### Added
- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) (#282)
+- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) ([issue 282](https://github.com/firefly-iii/firefly-iii/issues/282))
 - First start of German translation

 ### Changed
@@ -469,7 +639,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i

 ### Fixed
 - Bug in the mass edit routines.
- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks [dfiel](https://github.com/dfiel) for reporting.
+- Firefly III over a proxy will now work (see [issue 290](https://github.com/firefly-iii/firefly-iii/issues/290), thanks [dfiel](https://github.com/dfiel) for reporting.
 - Sneaky bug in the import routine, fixed by [Bonno](https://github.com/Bonno) 

 ## [3.10.1] - 2016-08-25
@@ -492,7 +662,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Fixed various bugs in the piggy banks pages.
 - Fixed a bug in the `firefly:verify` routine

-## [3.10] - 2015-05-25
+## [3.10] - 2016-08-12
 ### Added
 - New charts in year report
 - Can add / remove money from piggy bank on mobile device.
@@ -503,27 +673,27 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 ### Changed
 - Rewrote the import routine.
 - The date picker now supports more ranges and periods.
- Rewrote all migrations. #272
+- Rewrote all migrations. [issue 272](https://github.com/firefly-iii/firefly-iii/issues/272)

 ### Fixed
- Issue #264
- Issue #265
- Fixed amount calculation problems, #266, thanks [xzaz](https://github.com/xzaz)
- Issue #271
- Issue #278, #273, thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella)
+- [Issue 264](https://github.com/firefly-iii/firefly-iii/issues/264)
+- [Issue 265](https://github.com/firefly-iii/firefly-iii/issues/265)
+- Fixed amount calculation problems, [issue 266](https://github.com/firefly-iii/firefly-iii/issues/266), thanks [xzaz](https://github.com/xzaz)
+- [Issue 271](https://github.com/firefly-iii/firefly-iii/issues/271)
+- [Issue 278](https://github.com/firefly-iii/firefly-iii/issues/278), [issue 273](https://github.com/firefly-iii/firefly-iii/issues/273), thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella)
 - Bug in attachment download routine would report the wrong size to the user's browser.
 - Various NULL errors fixed.
 - Various strict typing errors fixed.
- Fixed pagination problems, #276, thanks [xzaz](https://github.com/xzaz)
+- Fixed pagination problems, [issue 276](https://github.com/firefly-iii/firefly-iii/issues/276), thanks [xzaz](https://github.com/xzaz)
 - Fixed a bug where an expense would be assigned to a piggy bank if you created a transfer first.
- Bulk update problems, #280, thanks [stickgrinder](https://github.com/stickgrinder)
+- Bulk update problems, [issue 280](https://github.com/firefly-iii/firefly-iii/issues/280), thanks [stickgrinder](https://github.com/stickgrinder)
 - Fixed various problems with amount reporting of split transactions.

-## [3.9.1]
+## [3.9.1] - 2016-06-06
 ### Fixed
- Fixed a bug where removing money from a piggy bank would not work. See issue #265 and #269
+- Fixed a bug where removing money from a piggy bank would not work. See [issue 265](https://github.com/firefly-iii/firefly-iii/issues/265) and [issue 269](https://github.com/firefly-iii/firefly-iii/issues/269)

-## [3.9.0]
+## [3.9.0] - 2016-05-22
 ### Added
 - [zjean](https://github.com/zjean) has added code that allows you to force "https://"-URL's.
 - [tonicospinelli](https://github.com/tonicospinelli) has added Portuguese (Brazil) translations.
--- a/33
+++ b/33
@@ -23,28 +23,31 @@ RUN docker-php-ext-install -j$(nproc) curl gd intl json mcrypt readline tidy zip
 # Generate locales supported by firefly
 RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8" > /etc/locale.gen && locale-gen

+COPY ./docker/apache2.conf /etc/apache2/apache2.conf
+
 # Enable apache mod rewrite..
 RUN a2enmod rewrite

+# Enable apache mod ssl..
+RUN a2enmod ssl
+
 # Setup the Composer installer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer && \
-  curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig && \
-  php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" && \
-  chmod +x /tmp/composer-setup.php && \
-  php /tmp/composer-setup.php && \
-  mv composer.phar /usr/local/bin/composer && \
-  rm -f /tmp/composer-setup.{php,sig}
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

-ADD . /var/www/firefly-iii
-RUN chown -R www-data:www-data /var/www/
-ADD docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
+# Copy Apache Configs
+COPY ./docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf

-USER www-data
+ENV FIREFLY_PATH /var/www/firefly-iii

-WORKDIR /var/www/firefly-iii
+WORKDIR $FIREFLY_PATH

-RUN composer install --no-scripts --no-dev
+# The working directory
+COPY . $FIREFLY_PATH

-USER root
+RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage

-ENTRYPOINT ["/var/www/firefly-iii/docker/entrypoint.sh"]
+RUN composer install --prefer-dist --no-dev --no-scripts
+
+EXPOSE 80
+
+ENTRYPOINT ["docker/entrypoint.sh"]
--- a/README.md
+++ b/README.md
@@ -1,26 +1,36 @@
 # Firefly III: A personal finances manager 

-[![Requires PHP7](https://img.shields.io/badge/php-7.0-red.svg)](https://secure.php.net/downloads.php) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![License](https://img.shields.io/badge/license-CC%20BY--SA%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
+[![Requires PHP7.1](https://img.shields.io/badge/php-7.1-red.svg)](https://secure.php.net/downloads.php) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![License](https://img.shields.io/badge/license-CC%20BY--SA%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 

 [![The index of Firefly III](https://i.nder.be/hurdhgyg/400)](https://i.nder.be/h2b37243) [![The account overview of Firefly III](https://i.nder.be/hnkfkdpr/400)](https://i.nder.be/hv70pbwc)

 [![The useful financial reports of Firefly III](https://i.nder.be/h7sk6nb7/400)](https://i.nder.be/ccn0u2mp) [![Even more useful reports in Firefly III](https://i.nder.be/g237hr35/400)](https://i.nder.be/gm8hbh7z)

-"Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared  household accounts and savings accounts! It's pretty fancy. You should use it to save and organise money.
+"Firefly III" is a financial manager for your personal finances.
+It can help you keep track of your expenses and income.
+Firefly III supports the use of budgets. You can categorize and tag your transactions.
+It also supports credit cards, shared  household accounts and savings accounts.
+There are many financial reports available.

 ## Try it out!

 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/firefly-iii/firefly-iii/tree/master)

-Firefly III can be run on Heroku. Register for a free Heroku account and instantly run Firefly III on your very own cloud instance. There is also a [demo site](https://firefly-iii.nder.be) with an example financial administration already present. 
+Firefly III can be run on Heroku.
+Register for a free Heroku account and instantly run Firefly III on your very own cloud instance.
+There is also a [demo site](https://firefly-iii.nder.be) with an example financial administration already present. 

 ## Getting started

-To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/using-installing.html).
+To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line.
+Then, please read the [installation guide](https://firefly-iii.github.io/using-installing.html).
+At the moment, installation is fairly complex. I hope to improve this in the future. If you need support, please open a ticket.

 ## More about Firefly III

-Personal financial management is pretty difficult, and everybody has their own approach to it. Some people make budgets, other people limit their cashflow by throwing away their credit cards, others try to increase their current cashflow. There are tons of ways to save and earn money.
+Personal financial management is pretty difficult, and everybody has their own approach to it.
+Some people make budgets, other people limit their cashflow by throwing away their credit cards, 
+others try to increase their current cashflow. There are tons of ways to save and earn money.

 Firefly works on the principle that if you know where you're money is going, you can stop it from going there.

@@ -31,7 +41,8 @@ Firefly works on the principle that if you know where you're money is going, you
 - Firefly has lots of features without being fancy or bloated.
 - If you feel you're missing something you can just ask me and I'll add it!

-Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).
+Firefly III has become pretty awesome over the years! (but please excuse me for bragging, it's just that I'm proud of it).
+[You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).

 ### Contributing

--- a/app/Console/Commands/CreateExport.php
+++ b/app/Console/Commands/CreateExport.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * CreateExport.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+
+namespace FireflyIII\Console\Commands;
+
+use Carbon\Carbon;
+use FireflyIII\Export\ProcessorInterface;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use Illuminate\Console\Command;
+use Storage;
+
+
+/**
+ * Class CreateExport
+ *
+ * Generates export from the command line.
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class CreateExport extends Command
+{
+    use VerifiesAccessToken;
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Use this command to create a new import. Your user ID can be found on the /profile page.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature
+        = 'firefly:create-export
+                            {--user= : The user ID that the import should import for.}
+                            {--token= : The user\'s access token.}
+                            {--with_attachments : Include user\'s attachments?}
+                            {--with_uploads : Include user\'s uploads?}';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return;
+        }
+        $this->line('Full export is running...');
+        // make repositories
+        /** @var UserRepositoryInterface $userRepository */
+        $userRepository = app(UserRepositoryInterface::class);
+        /** @var ExportJobRepositoryInterface $jobRepository */
+        $jobRepository = app(ExportJobRepositoryInterface::class);
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        /** @var JournalRepositoryInterface $journalRepository */
+        $journalRepository = app(JournalRepositoryInterface::class);
+
+        // set user
+        $user = $userRepository->find(intval($this->option('user')));
+        $jobRepository->setUser($user);
+        $journalRepository->setUser($user);
+        $accountRepository->setUser($user);
+
+        // first date
+        $firstJournal = $journalRepository->first();
+        $first        = new Carbon;
+        if (!is_null($firstJournal->id)) {
+            $first = $firstJournal->date;
+        }
+
+        // create job and settings.
+        $job      = $jobRepository->create();
+        $settings = [
+            'accounts'           => $accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]),
+            'startDate'          => $first,
+            'endDate'            => new Carbon,
+            'exportFormat'       => 'csv',
+            'includeAttachments' => $this->option('with_attachments'),
+            'includeOldUploads'  => $this->option('with_uploads'),
+            'job'                => $job,
+        ];
+
+
+        /** @var ProcessorInterface $processor */
+        $processor = app(ProcessorInterface::class);
+        $processor->setSettings($settings);
+
+        $processor->collectJournals();
+        $processor->convertJournals();
+        $processor->exportJournals();
+        if ($settings['includeAttachments']) {
+            $processor->collectAttachments();
+        }
+
+        if ($settings['includeOldUploads']) {
+            $processor->collectOldUploads();
+        }
+
+        $processor->createZipFile();
+        $disk     = Storage::disk('export');
+        $fileName = sprintf('export-%s.zip', date('Y-m-d_H-i-s'));
+        $disk->move($job->key . '.zip', $fileName);
+
+        $this->line('The export has finished! You can find the ZIP file in this location:');
+        $this->line(storage_path(sprintf('export/%s', $fileName)));
+
+        return;
+    }
+}
--- a/app/Console/Commands/CreateImport.php
+++ b/app/Console/Commands/CreateImport.php
@@ -14,10 +14,14 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands;

 use Artisan;
+use FireflyIII\Import\Logging\CommandHandler;
+use FireflyIII\Import\Routine\ImportRoutine;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
+use Illuminate\Support\MessageBag;
 use Log;
+use Monolog\Formatter\LineFormatter;

 /**
 * Class CreateImport
@@ -26,6 +30,7 @@ use Log;
 */
 class CreateImport extends Command
 {
+    use VerifiesAccessToken;
    /**
     * The console command description.
     *
@@ -38,7 +43,14 @@ class CreateImport extends Command
     *
     * @var string
     */
-    protected $signature = 'firefly:create-import {file} {configuration} {--user=1} {--type=csv} {--start}';
+    protected $signature
+        = 'firefly:create-import
+                            {file : The file to import.}
+                            {configuration : The configuration file to use for the import/}
+                            {--type=csv : The file type of the import.}
+                            {--user= : The user ID that the import should import for.}
+                            {--token= : The user\'s access token.}
+                            {--start : Starts the job immediately.}';

    /**
     * Create a new command instance.
@@ -50,10 +62,18 @@ class CreateImport extends Command
    }

    /**
+     * Run the command.
+     *
     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
     */
    public function handle()
    {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return;
+        }
        /** @var UserRepositoryInterface $userRepository */
        $userRepository = app(UserRepositoryInterface::class);
        $file           = $this->argument('file');
@@ -73,36 +93,63 @@ class CreateImport extends Command
            return;
        }

-        $this->info(sprintf('Going to create a job to import file: %s', $file));
-        $this->info(sprintf('Using configuration file: %s', $configuration));
-        $this->info(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
-        $this->info(sprintf('Type of import: %s', $type));
+        $this->line(sprintf('Going to create a job to import file: %s', $file));
+        $this->line(sprintf('Using configuration file: %s', $configuration));
+        $this->line(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
+        $this->line(sprintf('Type of import: %s', $type));
+

        /** @var ImportJobRepositoryInterface $jobRepository */
        $jobRepository = app(ImportJobRepositoryInterface::class);
        $jobRepository->setUser($user);
        $job = $jobRepository->create($type);
-        $this->line(sprintf('Created job "%s"...', $job->key));
+        $this->line(sprintf('Created job "%s"', $job->key));
+

        Artisan::call('firefly:encrypt-file', ['file' => $file, 'key' => $job->key]);
        $this->line('Stored import data...');

+
        $job->configuration = $configurationData;
        $job->status        = 'configured';
        $job->save();
        $this->line('Stored configuration...');

+
        if ($this->option('start') === true) {
            $this->line('The import will start in a moment. This process is not visible...');
            Log::debug('Go for import!');
-            Artisan::call('firefly:start-import', ['key' => $job->key]);
-            $this->line('Done!');
+
+            // normally would refer to other firefly:start-import but that doesn't seem to work all to well...
+            $monolog   = Log::getMonolog();
+            $handler   = new CommandHandler($this);
+            $formatter = new LineFormatter(null, null, false, true);
+            $handler->setFormatter($formatter);
+            $monolog->pushHandler($handler);
+
+
+            // start the actual routine:
+            /** @var ImportRoutine $routine */
+            $routine = app(ImportRoutine::class);
+            $routine->setJob($job);
+            $routine->run();
+
+            // give feedback.
+            /** @var MessageBag $error */
+            foreach ($routine->errors as $index => $error) {
+                $this->error(sprintf('Error importing line #%d: %s', $index, $error));
+            }
+            $this->line(
+                sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines)
+            );
        }

        return;
    }

    /**
+     * Verify user inserts correct arguments.
+     *
     * @return bool
     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
     */
@@ -116,12 +163,12 @@ class CreateImport extends Command
        $cwd            = getcwd();
        $validTypes     = array_keys(config('firefly.import_formats'));
        $type           = strtolower($this->option('type'));
-
        if (is_null($user->id)) {
            $this->error(sprintf('There is no user with ID %d.', $this->option('user')));

            return false;
        }
+
        if (!in_array($type, $validTypes)) {
            $this->error(sprintf('Cannot import file of type "%s"', $type));

--- a/app/Console/Commands/DecryptAttachment.php
+++ b/app/Console/Commands/DecryptAttachment.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * DecryptAttachment.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Console\Command;
+use Log;
+
+/**
+ * Class DecryptAttachment
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class DecryptAttachment extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Decrypts an attachment and dumps the content in a file in the given directory.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature
+        = 'firefly:decrypt-attachment {id:The ID of the attachment.} {name:The file name of the attachment.} 
+    {directory:Where the file must be stored.}';
+
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     */
+    public function handle()
+    {
+        /** @var AttachmentRepositoryInterface $repository */
+        $repository     = app(AttachmentRepositoryInterface::class);
+        $attachmentId   = intval($this->argument('id'));
+        $attachment     = $repository->findWithoutUser($attachmentId);
+        $attachmentName = trim($this->argument('name'));
+        $storagePath    = realpath(trim($this->argument('directory')));
+        if (is_null($attachment->id)) {
+            $this->error(sprintf('No attachment with id #%d', $attachmentId));
+            Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId));
+
+            return;
+        }
+
+        if ($attachmentName !== $attachment->filename) {
+            $this->error('File name does not match.');
+            Log::error('DecryptAttachment: File name does not match.');
+
+            return;
+        }
+
+        if (!is_dir($storagePath)) {
+            $this->error(sprintf('Path "%s" is not a directory.', $storagePath));
+            Log::error(sprintf('DecryptAttachment: Path "%s" is not a directory.', $storagePath));
+
+            return;
+        }
+
+        if (!is_writable($storagePath)) {
+            $this->error(sprintf('Path "%s" is not writable.', $storagePath));
+            Log::error(sprintf('DecryptAttachment: Path "%s" is not writable.', $storagePath));
+
+            return;
+        }
+
+        $fullPath = $storagePath . DIRECTORY_SEPARATOR . $attachment->filename;
+        $content  = $repository->getContent($attachment);
+        $this->line(sprintf('Going to write content for attachment #%d into file "%s"', $attachment->id, $fullPath));
+        $result = file_put_contents($fullPath, $content);
+        if ($result === false) {
+            $this->error('Could not write to file.');
+
+            return;
+        }
+        $this->info(sprintf('%d bytes written. Exiting now..', $result));
+
+        return;
+    }
+}
--- a/app/Console/Commands/Import.php
+++ b/app/Console/Commands/Import.php
@@ -51,7 +51,7 @@ class Import extends Command
    }

    /**
-     *
+     * Run the import routine.
     */
    public function handle()
    {
@@ -91,6 +91,8 @@ class Import extends Command
    }

    /**
+     * Check if job is valid to be imported.
+     *
     * @param ImportJob $job
     *
     * @return bool
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -20,23 +20,27 @@ use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
-use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionJournalMeta;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Console\Command;
-use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Collection;
 use Log;
 use Preferences;
 use Schema;
-use Steam;

 /**
 * Class UpgradeDatabase
 *
+ * Upgrade user database.
+ *
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // it just touches a lot of things.
 * @package FireflyIII\Console\Commands
 */
 class UpgradeDatabase extends Command
@@ -70,73 +74,28 @@ class UpgradeDatabase extends Command
    {
        $this->setTransactionIdentifier();
        $this->migrateRepetitions();
-        $this->repairPiggyBanks();
        $this->updateAccountCurrencies();
-        $this->updateJournalCurrencies();
-        $this->currencyInfoToTransactions();
-        $this->verifyCurrencyInfo();
+        $this->line('Updating currency information..');
+        $this->updateTransferCurrencies();
+        $this->updateOtherCurrencies();
+        $this->line('Done updating currency information..');
+        $this->migrateNotes();
        $this->info('Firefly III database is up to date.');
+
+        return;
+
+
    }

    /**
-     * Moves the currency id info to the transaction instead of the journal.
+     * Migrate budget repetitions to new format where the end date is in the budget limit as well,
+     * making the limit_repetition table obsolete.
     */
-    private function currencyInfoToTransactions()
+    public function migrateRepetitions(): void
    {
-        $count = 0;
-        $set   = TransactionJournal::with('transactions')->get();
-        /** @var TransactionJournal $journal */
-        foreach ($set as $journal) {
-            /** @var Transaction $transaction */
-            foreach ($journal->transactions as $transaction) {
-                if (is_null($transaction->transaction_currency_id)) {
-                    $transaction->transaction_currency_id = $journal->transaction_currency_id;
-                    $transaction->save();
-                    $count++;
-                }
-            }
-
-
-            // read and use the foreign amounts when present.
-            if ($journal->hasMeta('foreign_amount')) {
-                $amount = Steam::positive($journal->getMeta('foreign_amount'));
-
-                // update both transactions:
-                foreach ($journal->transactions as $transaction) {
-                    $transaction->foreign_amount = $amount;
-                    if (bccomp($transaction->amount, '0') === -1) {
-                        // update with negative amount:
-                        $transaction->foreign_amount = bcmul($amount, '-1');
-                    }
-                    // set foreign currency id:
-                    $transaction->foreign_currency_id = intval($journal->getMeta('foreign_currency_id'));
-                    $transaction->save();
-                }
-                $journal->deleteMeta('foreign_amount');
-                $journal->deleteMeta('foreign_currency_id');
-            }
-
-        }
-
-        $this->line(sprintf('Updated currency information for %d transactions', $count));
-    }
-
-    /**
-     *  Migrate budget repetitions to new format.
-     */
-    private function migrateRepetitions()
-    {
-        if (!Schema::hasTable('budget_limits')) {
-            return;
-        }
-        // get all budget limits with end_date NULL
        $set = BudgetLimit::whereNull('end_date')->get();
-        if ($set->count() > 0) {
-            $this->line(sprintf('Found %d budget limit(s) to update', $set->count()));
-        }
        /** @var BudgetLimit $budgetLimit */
        foreach ($set as $budgetLimit) {
-            // get limit repetition (should be just one):
            /** @var LimitRepetition $repetition */
            $repetition = $budgetLimit->limitrepetitions()->first();
            if (!is_null($repetition)) {
@@ -146,56 +105,30 @@ class UpgradeDatabase extends Command
                $repetition->delete();
            }
        }
+
+        return;
    }

    /**
-     * Make sure there are only transfers linked to piggy bank events.
+     * This method gives all transactions which are part of a split journal (so more than 2) a sort of "order" so they are easier
+     * to easier to match to their counterpart. When a journal is split, it has two or three transactions: -3, -4 and -5 for example.
+     *
+     * In the database this is reflected as 6 transactions: -3/+3, -4/+4, -5/+5.
+     *
+     * When either of these are the same amount, FF3 can't keep them apart: +3/-3, +3/-3, +3/-3. This happens more often than you would
+     * think. So each set gets a number (1,2,3) to keep them apart.
     */
-    private function repairPiggyBanks()
-    {
-        // if table does not exist, return false
-        if (!Schema::hasTable('piggy_bank_events')) {
-            return;
-        }
-        $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
-        /** @var PiggyBankEvent $event */
-        foreach ($set as $event) {
-
-            if (is_null($event->transaction_journal_id)) {
-                continue;
-            }
-            /** @var TransactionJournal $journal */
-            $journal = $event->transactionJournal()->first();
-            if (is_null($journal)) {
-                continue;
-            }
-
-            $type = $journal->transactionType->type;
-            if ($type !== TransactionType::TRANSFER) {
-                $event->transaction_journal_id = null;
-                $event->save();
-                $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
-            }
-        }
-    }
-
-    /**
-     * This is strangely complex, because the HAVING modifier is a no-no. And subqueries in Laravel are weird.
-     */
-    private function setTransactionIdentifier()
+    public function setTransactionIdentifier(): void
    {
        // if table does not exist, return false
        if (!Schema::hasTable('transaction_journals')) {
            return;
        }
-
-
-        $subQuery = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                      ->whereNull('transaction_journals.deleted_at')
-                                      ->whereNull('transactions.deleted_at')
-                                      ->groupBy(['transaction_journals.id'])
-                                      ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
-
+        $subQuery   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                        ->whereNull('transaction_journals.deleted_at')
+                                        ->whereNull('transactions.deleted_at')
+                                        ->groupBy(['transaction_journals.id'])
+                                        ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
        $result     = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
                        ->mergeBindings($subQuery->getQuery())
                        ->where('t_count', '>', 2)
@@ -203,59 +136,203 @@ class UpgradeDatabase extends Command
        $journalIds = array_unique($result->pluck('id')->toArray());

        foreach ($journalIds as $journalId) {
-            $this->updateJournal(intval($journalId));
+            $this->updateJournalidentifiers(intval($journalId));
        }
+
+        return;
    }

    /**
+     * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon the account.
     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's seven but it can't really be helped.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
     */
-    private function updateAccountCurrencies()
+    public function updateAccountCurrencies(): void
    {
        $accounts = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
                           ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->get(['accounts.*']);

-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            // get users preference, fall back to system pref.
-            $defaultCurrencyCode    = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
-            $defaultCurrency        = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
-            $accountCurrency        = intval($account->getMeta('currency_id'));
-            $openingBalance         = $account->getOpeningBalance();
-            $openingBalanceCurrency = intval($openingBalance->transaction_currency_id);
+        $accounts->each(
+            function (Account $account) {
+                // get users preference, fall back to system pref.
+                $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
+                $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
+                $accountCurrency     = intval($account->getMeta('currency_id'));
+                $openingBalance      = $account->getOpeningBalance();
+                $obCurrency          = intval($openingBalance->transaction_currency_id);

-            // both 0? set to default currency:
-            if ($accountCurrency === 0 && $openingBalanceCurrency === 0) {
-                AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
-                $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
-                continue;
+                // both 0? set to default currency:
+                if ($accountCurrency === 0 && $obCurrency === 0) {
+                    AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
+                    $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+
+                    return true;
+                }
+
+                // account is set to 0, opening balance is not?
+                if ($accountCurrency === 0 && $obCurrency > 0) {
+                    AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]);
+                    $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+
+                    return true;
+                }
+
+                // do not match and opening balance id is not null.
+                if ($accountCurrency !== $obCurrency && $openingBalance->id > 0) {
+                    // update opening balance:
+                    $openingBalance->transaction_currency_id = $accountCurrency;
+                    $openingBalance->save();
+                    $this->line(sprintf('Account #%d ("%s") now has a correct currency for opening balance.', $account->id, $account->name));
+
+                    return true;
+                }
+
+                return true;
+            }
+        );
+
+        return;
+    }
+
+    /**
+     * This routine verifies that withdrawals, deposits and opening balances have the correct currency settings for
+     * the accounts they are linked to.
+     *
+     * Both source and destination must match the respective currency preference of the related asset account.
+     * So FF3 must verify all transactions.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function updateOtherCurrencies(): void
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $set        = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->whereIn('transaction_types.type', [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
+            ->get(['transaction_journals.*']);
+
+        $set->each(
+            function (TransactionJournal $journal) use ($repository) {
+                // get the transaction with the asset account in it:
+                /** @var Transaction $transaction */
+                $transaction = $journal->transactions()
+                                       ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                       ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                                       ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->first(['transactions.*']);
+                if (is_null($transaction)) {
+                    return;
+                }
+                /** @var Account $account */
+                $account      = $transaction->account;
+                $currency     = $repository->find(intval($account->getMeta('currency_id')));
+                $transactions = $journal->transactions()->get();
+                $transactions->each(
+                    function (Transaction $transaction) use ($currency) {
+                        if (is_null($transaction->transaction_currency_id)) {
+                            $transaction->transaction_currency_id = $currency->id;
+                            $transaction->save();
+                        }
+
+                        // when mismatch in transaction:
+                        if ($transaction->transaction_currency_id !== $currency->id) {
+                            $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
+                            $transaction->foreign_amount          = $transaction->amount;
+                            $transaction->transaction_currency_id = $currency->id;
+                            $transaction->save();
+                        }
+                    }
+                );
+                // also update the journal, of course:
+                $journal->transaction_currency_id = $currency->id;
+                $journal->save();
+            }
+        );
+
+        return;
+    }
+
+    /**
+     * This routine verifies that transfers have the correct currency settings for the accounts they are linked to.
+     * For transfers, this is can be a destructive routine since we FORCE them into a currency setting whether they
+     * like it or not. Previous routines MUST have set the currency setting for both accounts for this to work.
+     *
+     * A transfer always has the
+     *
+     * Both source and destination must match the respective currency preference. So FF3 must verify ALL
+     * transactions.
+     */
+    public function updateTransferCurrencies()
+    {
+        $set = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->where('transaction_types.type', TransactionType::TRANSFER)
+            ->get(['transaction_journals.*']);
+
+        $set->each(
+            function (TransactionJournal $transfer) {
+                // select all "source" transactions:
+                /** @var Collection $transactions */
+                $transactions = $transfer->transactions()->where('amount', '<', 0)->get();
+                $transactions->each(
+                    function (Transaction $transaction) {
+                        $this->updateTransactionCurrency($transaction);
+                        $this->updateJournalCurrency($transaction);
+                    }
+                );
+            }
+        );
+    }
+
+    /**
+     * Move all the journal_meta notes to their note object counter parts.
+     */
+    private function migrateNotes(): void
+    {
+        $set = TransactionJournalMeta::whereName('notes')->get();
+        /** @var TransactionJournalMeta $meta */
+        foreach ($set as $meta) {
+            $journal = $meta->transactionJournal;
+            $note    = $journal->notes()->first();
+            if (is_null($note)) {
+                $note = new Note;
+                $note->noteable()->associate($journal);
            }

-            // opening balance 0, account not zero? just continue:
-            if ($accountCurrency > 0 && $openingBalanceCurrency === 0) {
-                continue;
-            }
-            // account is set to 0, opening balance is not?
-            if ($accountCurrency === 0 && $openingBalanceCurrency > 0) {
-                AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $openingBalanceCurrency]);
-                $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
-                continue;
-            }
+            $note->text = $meta->data;
+            $note->save();
+            Log::debug(sprintf('Migrated meta note #%d to Note #%d', $meta->id, $note->id));
+            $meta->delete();

-            // both are equal, just continue:
-            if ($accountCurrency === $openingBalanceCurrency) {
-                continue;
-            }
-            // do not match:
-            if ($accountCurrency !== $openingBalanceCurrency) {
-                // update opening balance:
-                $openingBalance->transaction_currency_id = $accountCurrency;
-                $openingBalance->save();
-                $this->line(sprintf('Account #%d ("%s") now has a correct currency for opening balance.', $account->id, $account->name));
-                continue;
-            }
+        }
+    }
+
+
+    /**
+     * This method makes sure that the transaction journal uses the currency given in the transaction.
+     *
+     * @param Transaction $transaction
+     */
+    private function updateJournalCurrency(Transaction $transaction): void
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+        $journal    = $transaction->transactionJournal;
+
+        if (!(intval($currency->id) === intval($journal->transaction_currency_id))) {
+            $this->line(
+                sprintf(
+                    'Transfer #%d ("%s") has been updated to use %s instead of %s.', $journal->id, $journal->description, $currency->code,
+                    $journal->transactionCurrency->code
+                )
+            );
+            $journal->transaction_currency_id = $currency->id;
+            $journal->save();
        }

+        return;
    }

    /**
@@ -264,7 +341,7 @@ class UpgradeDatabase extends Command
     *
     * @param int $journalId
     */
-    private function updateJournal(int $journalId)
+    private function updateJournalidentifiers(int $journalId): void
    {
        $identifier   = 0;
        $processed    = [];
@@ -292,121 +369,134 @@ class UpgradeDatabase extends Command
            if (!is_null($opposing)) {
                // give both a new identifier:
                $transaction->identifier = $identifier;
+                $opposing->identifier    = $identifier;
                $transaction->save();
-                $opposing->identifier = $identifier;
                $opposing->save();
                $processed[] = $transaction->id;
                $processed[] = $opposing->id;
            }
            $identifier++;
        }
+
+        return;
    }

    /**
-     * Makes sure that withdrawals, deposits and transfers have
-     * a currency setting matching their respective accounts
-     */
-    private function updateJournalCurrencies()
-    {
-        $types        = [
-            TransactionType::WITHDRAWAL => '<',
-            TransactionType::DEPOSIT    => '>',
-        ];
-        $repository   = app(CurrencyRepositoryInterface::class);
-        $notification = '%s #%d uses %s but should use %s. It has been updated. Please verify this in Firefly III.';
-        $transfer     = 'Transfer #%d has been updated to use the correct currencies. Please verify this in Firefly III.';
-        $driver       = DB::connection()->getDriverName();
-        $pgsql        = ['pgsql', 'postgresql'];
-
-        foreach ($types as $type => $operator) {
-            $query = TransactionJournal
-                ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')->leftJoin(
-                    'transactions', function (JoinClause $join) use ($operator) {
-                    $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', $operator, '0');
-                }
-                )
-                ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
-                ->where('transaction_types.type', $type)
-                ->where('account_meta.name', 'currency_id');
-            if (in_array($driver, $pgsql)) {
-                $query->where('transaction_journals.transaction_currency_id', '!=', DB::raw('cast(account_meta.data as int)'));
-            }
-            if (!in_array($driver, $pgsql)) {
-                $query->where('transaction_journals.transaction_currency_id', '!=', DB::raw('account_meta.data'));
-            }
-
-            $set = $query->get(['transaction_journals.*', 'account_meta.data as expected_currency_id', 'transactions.amount as transaction_amount']);
-            /** @var TransactionJournal $journal */
-            foreach ($set as $journal) {
-                $expectedCurrency = $repository->find(intval($journal->expected_currency_id));
-                $line             = sprintf($notification, $type, $journal->id, $journal->transactionCurrency->code, $expectedCurrency->code);
-
-                $journal->setMeta('foreign_amount', $journal->transaction_amount);
-                $journal->setMeta('foreign_currency_id', $journal->transaction_currency_id);
-                $journal->transaction_currency_id = $expectedCurrency->id;
-                $journal->save();
-                $this->line($line);
-            }
-        }
-        /*
-         * For transfers it's slightly different. Both source and destination
-         * must match the respective currency preference. So we must verify ALL
-         * transactions.
-         */
-        $set = TransactionJournal
-            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-            ->where('transaction_types.type', TransactionType::TRANSFER)
-            ->get(['transaction_journals.*']);
-        /** @var TransactionJournal $journal */
-        foreach ($set as $journal) {
-            $updated = false;
-            /** @var Transaction $sourceTransaction */
-            $sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();
-            $sourceCurrency    = $repository->find(intval($sourceTransaction->account->getMeta('currency_id')));
-
-            if ($sourceCurrency->id !== $journal->transaction_currency_id) {
-                $updated                          = true;
-                $journal->transaction_currency_id = $sourceCurrency->id;
-                $journal->save();
-            }
-
-            // destination
-            $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
-            $destinationCurrency    = $repository->find(intval($destinationTransaction->account->getMeta('currency_id')));
-
-            if ($destinationCurrency->id !== $journal->transaction_currency_id) {
-                $updated = true;
-                $journal->deleteMeta('foreign_amount');
-                $journal->deleteMeta('foreign_currency_id');
-                $journal->setMeta('foreign_amount', $destinationTransaction->amount);
-                $journal->setMeta('foreign_currency_id', $destinationCurrency->id);
-            }
-            if ($updated) {
-                $line = sprintf($transfer, $journal->id);
-                $this->line($line);
-            }
-        }
-    }
-
-    /**
+     * This method makes sure that the tranaction uses the same currency as the source account does.
+     * If not, the currency is updated to include a reference to its original currency as the "foreign" currency.
     *
+     * The transaction that is sent to this function MUST be the source transaction (amount negative).
+     *
+     * Method is long and complex bit I'm taking it for granted.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
+     * @param Transaction $transaction
     */
-    private function verifyCurrencyInfo()
+    private function updateTransactionCurrency(Transaction $transaction): void
    {
-        $count        = 0;
-        $transactions = Transaction::get();
-        /** @var Transaction $transaction */
-        foreach ($transactions as $transaction) {
-            $currencyId = intval($transaction->transaction_currency_id);
-            $foreignId  = intval($transaction->foreign_currency_id);
-            if ($currencyId === $foreignId) {
-                $transaction->foreign_currency_id = null;
-                $transaction->foreign_amount      = null;
-                $transaction->save();
-                $count++;
-            }
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+
+        // has no currency ID? Must have, so fill in using account preference:
+        if (is_null($transaction->transaction_currency_id)) {
+            $transaction->transaction_currency_id = $currency->id;
+            Log::debug(sprintf('Transaction #%d has no currency setting, now set to %s', $transaction->id, $currency->code));
+            $transaction->save();
        }
-        $this->line(sprintf('Updated currency information for %d transactions', $count));
+
+        // does not match the source account (see above)? Can be fixed
+        // when mismatch in transaction and NO foreign amount is set:
+        if ($transaction->transaction_currency_id !== $currency->id && is_null($transaction->foreign_amount)) {
+            Log::debug(
+                sprintf(
+                    'Transaction #%d has a currency setting (#%d) that should be #%d. Amount remains %s, currency is changed.', $transaction->id,
+                    $transaction->transaction_currency_id, $currency->id, $transaction->amount
+                )
+            );
+            $transaction->transaction_currency_id = $currency->id;
+            $transaction->save();
+        }
+
+        // grab opposing transaction:
+        /** @var TransactionJournal $journal */
+        $journal = $transaction->transactionJournal;
+        /** @var Transaction $opposing */
+        $opposing         = $journal->transactions()->where('amount', '>', 0)->where('identifier', $transaction->identifier)->first();
+        $opposingCurrency = $repository->find(intval($opposing->account->getMeta('currency_id')));
+
+        if (is_null($opposingCurrency->id)) {
+            Log::error(sprintf('Account #%d ("%s") must have currency preference but has none.', $opposing->account->id, $opposing->account->name));
+
+            return;
+        }
+
+        // if the destination account currency is the same, both foreign_amount and foreign_currency_id must be NULL for both transactions:
+        if ($opposingCurrency->id === $currency->id) {
+            // update both transactions to match:
+            $transaction->foreign_amount       = null;
+            $transaction->foreign_currency_id  = null;
+            $opposing->foreign_amount          = null;
+            $opposing->foreign_currency_id     = null;
+            $opposing->transaction_currency_id = $currency->id;
+            $transaction->save();
+            $opposing->save();
+            Log::debug(sprintf('Cleaned up transaction #%d and #%d', $transaction->id, $opposing->id));
+
+            return;
+        }
+        // if destination account currency is different, both transactions must have this currency as foreign currency id.
+        if ($opposingCurrency->id !== $currency->id) {
+            $transaction->foreign_currency_id = $opposingCurrency->id;
+            $opposing->foreign_currency_id    = $opposingCurrency->id;
+            $transaction->save();
+            $opposing->save();
+            Log::debug(sprintf('Verified foreign currency ID of transaction #%d and #%d', $transaction->id, $opposing->id));
+        }
+
+        // if foreign amount of one is null and the other is not, use this to restore:
+        if (is_null($transaction->foreign_amount) && !is_null($opposing->foreign_amount)) {
+            $transaction->foreign_amount = bcmul(strval($opposing->foreign_amount), '-1');
+            $transaction->save();
+            Log::debug(sprintf('Restored foreign amount of transaction (1) #%d to %s', $transaction->id, $transaction->foreign_amount));
+        }
+
+        // if foreign amount of one is null and the other is not, use this to restore (other way around)
+        if (is_null($opposing->foreign_amount) && !is_null($transaction->foreign_amount)) {
+            $opposing->foreign_amount = bcmul(strval($transaction->foreign_amount), '-1');
+            $opposing->save();
+            Log::debug(sprintf('Restored foreign amount of transaction (2) #%d to %s', $opposing->id, $opposing->foreign_amount));
+        }
+
+        // when both are zero, try to grab it from journal:
+        if (is_null($opposing->foreign_amount) && is_null($transaction->foreign_amount)) {
+
+            $foreignAmount = $journal->getMeta('foreign_amount');
+            if (is_null($foreignAmount)) {
+                Log::debug(sprintf('Journal #%d has missing foreign currency data, forced to do 1:1 conversion :(.', $transaction->transaction_journal_id));
+                $transaction->foreign_amount = bcmul(strval($transaction->amount), '-1');
+                $opposing->foreign_amount    = bcmul(strval($opposing->amount), '-1');
+                $transaction->save();
+                $opposing->save();
+
+                return;
+            }
+            $foreignPositive = app('steam')->positive(strval($foreignAmount));
+            Log::debug(
+                sprintf(
+                    'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").', $transaction->transaction_journal_id, $foreignAmount
+                )
+            );
+            $transaction->foreign_amount = bcmul($foreignPositive, '-1');
+            $opposing->foreign_amount    = $foreignPositive;
+            $transaction->save();
+            $opposing->save();
+        }
+
+
+        return;
    }
 }
--- a/app/Console/Commands/UpgradeFireflyInstructions.php
+++ b/app/Console/Commands/UpgradeFireflyInstructions.php
@@ -50,10 +50,10 @@ class UpgradeFireflyInstructions extends Command
    public function handle()
    {

-        if ($this->argument('task') == 'update') {
+        if ($this->argument('task') === 'update') {
            $this->updateInstructions();
        }
-        if ($this->argument('task') == 'install') {
+        if ($this->argument('task') === 'install') {
            $this->installInstructions();
        }
    }
@@ -84,6 +84,9 @@ class UpgradeFireflyInstructions extends Command
        }
    }

+    /**
+     * Render instructions.
+     */
    private function installInstructions()
    {
        /** @var string $version */
@@ -102,7 +105,7 @@ class UpgradeFireflyInstructions extends Command
        $this->boxed('');
        if (is_null($text)) {

-            $this->boxed(sprintf('Thank you for installin Firefly III, v%s!', $version));
+            $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
            $this->boxedInfo('There are no extra installation instructions.');
            $this->boxed('Firefly III should be ready for use.');
            $this->boxed('');
@@ -131,6 +134,9 @@ class UpgradeFireflyInstructions extends Command

    }

+    /**
+     * Render upgrade instructions.
+     */
    private function updateInstructions()
    {
        /** @var string $version */
--- a/app/Console/Commands/UseEncryption.php
+++ b/app/Console/Commands/UseEncryption.php
@@ -1,10 +1,34 @@
 <?php

+/**
+ * UseEncryption.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+/**
+ * UseEncryption.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 namespace FireflyIII\Console\Commands;

 use Illuminate\Console\Command;
 use Illuminate\Support\Str;

+/**
+ * Class UseEncryption
+ *
+ * @package FireflyIII\Console\Commands
+ */
 class UseEncryption extends Command
 {
    /**
@@ -34,7 +58,6 @@ class UseEncryption extends Command
     */
    public function handle()
    {
-        //
        $this->handleObjects('Account', 'name', 'encrypted');
        $this->handleObjects('Bill', 'name', 'name_encrypted');
        $this->handleObjects('Bill', 'match', 'match_encrypted');
@@ -45,6 +68,8 @@ class UseEncryption extends Command
    }

    /**
+     * Run each object and encrypt them (or not).
+     *
     * @param string $class
     * @param string $field
     * @param string $indicator
--- a/app/Console/Commands/VerifiesAccessToken.php
+++ b/app/Console/Commands/VerifiesAccessToken.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * VerifiesAccessToken.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use Log;
+use Preferences;
+
+/**
+ * Trait VerifiesAccessToken
+ *
+ * Verifies user access token for sensitive commands.
+ *
+ * @package FireflyIII\Console\Commands
+ */
+trait VerifiesAccessToken
+{
+    /**
+     * Abstract method to make sure trait knows about method "option".
+     *
+     * @param null $key
+     *
+     * @return mixed
+     */
+    abstract public function option($key = null);
+
+    /**
+     * Returns false when given token does not match given user token.
+     *
+     * @return bool
+     */
+    protected function verifyAccessToken(): bool
+    {
+        $userId = intval($this->option('user'));
+        $token  = strval($this->option('token'));
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+        $user       = $repository->find($userId);
+
+        if (is_null($user->id)) {
+            Log::error(sprintf('verifyAccessToken(): no such user for input "%d"', $userId));
+
+            return false;
+        }
+        $accessToken = Preferences::getForUser($user, 'access_token', null);
+        if (is_null($accessToken)) {
+            Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId));
+
+            return false;
+        }
+        if (!($accessToken->data === $token)) {
+            Log::error(sprintf('Invalid access token for user #%d.', $userId));
+
+            return false;
+        }
+
+        return true;
+    }
+
+}
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -17,6 +17,8 @@ use Crypt;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
+use FireflyIII\Models\LinkType;
+use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
@@ -25,12 +27,15 @@ use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder;
+use Preferences;
 use Schema;
 use stdClass;

 /**
 * Class VerifyDatabase
 *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
 * @package FireflyIII\Console\Commands
 */
 class VerifyDatabase extends Command
@@ -69,33 +74,93 @@ class VerifyDatabase extends Command
        $this->reportObject('budget');
        $this->reportObject('category');
        $this->reportObject('tag');
-
-        // accounts with no transactions.
        $this->reportAccounts();
-        // budgets with no limits
        $this->reportBudgetLimits();
-        // budgets with no transactions
-
-        // sum of transactions is not zero.
        $this->reportSum();
-        //  any deleted transaction journals that have transactions that are NOT deleted:
        $this->reportJournals();
-        // deleted transactions that are connected to a not deleted journal.
        $this->reportTransactions();
-        // deleted accounts that still have not deleted transactions or journals attached to them.
        $this->reportDeletedAccounts();
-
-        // report on journals with no transactions at all.
        $this->reportNoTransactions();
-
-        // transfers with budgets.
        $this->reportTransfersBudgets();
-
-        // report on journals with the wrong types of accounts.
        $this->reportIncorrectJournals();
+        $this->repairPiggyBanks();
+        $this->createLinkTypes();
+        $this->createAccessTokens();

    }

+    /**
+     * Create user access tokens, if not present already.
+     */
+    private function createAccessTokens()
+    {
+        $users = User::get();
+        /** @var User $user */
+        foreach ($users as $user) {
+            $pref = Preferences::getForUser($user, 'access_token', null);
+            if (is_null($pref)) {
+                $token = $user->generateAccessToken();
+                Preferences::setForUser($user, 'access_token', $token);
+                $this->line(sprintf('Generated access token for user %s', $user->email));
+            }
+        }
+    }
+
+    /**
+     * Create default link types if necessary.
+     */
+    private function createLinkTypes()
+    {
+        $set = [
+            'Related'       => ['relates to', 'relates to'],
+            'Refund'        => ['(partially) refunds', 'is (partially) refunded by'],
+            'Paid'          => ['(partially) pays for', 'is (partially) paid for by'],
+            'Reimbursement' => ['(partially) reimburses', 'is (partially) reimbursed by'],
+        ];
+        foreach ($set as $name => $values) {
+            $link = LinkType::where('name', $name)->where('outward', $values[0])->where('inward', $values[1])->first();
+            if (is_null($link)) {
+                $link          = new LinkType;
+                $link->name    = $name;
+                $link->outward = $values[0];
+                $link->inward  = $values[1];
+            }
+            $link->editable = false;
+            $link->save();
+        }
+    }
+
+    /**
+     * Eeport (and fix) piggy banks. Make sure there are only transfers linked to piggy bank events.
+     */
+    private function repairPiggyBanks(): void
+    {
+        $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
+        $set->each(
+            function (PiggyBankEvent $event) {
+                if (is_null($event->transaction_journal_id)) {
+                    return true;
+                }
+                /** @var TransactionJournal $journal */
+                $journal = $event->transactionJournal()->first();
+                if (is_null($journal)) {
+                    return true;
+                }
+
+                $type = $journal->transactionType->type;
+                if ($type !== TransactionType::TRANSFER) {
+                    $event->transaction_journal_id = null;
+                    $event->save();
+                    $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
+                }
+
+                return true;
+            }
+        );
+
+        return;
+    }
+
    /**
     * Reports on accounts with no transactions.
     */
@@ -169,6 +234,9 @@ class VerifyDatabase extends Command
        }
    }

+    /**
+     * Report on journals with bad account types linked to them.
+     */
    private function reportIncorrectJournals()
    {
        $configuration = [
@@ -235,7 +303,7 @@ class VerifyDatabase extends Command
    }

    /**
-     *
+     * Report on journals without transactions.
     */
    private function reportNoTransactions()
    {
@@ -253,13 +321,15 @@ class VerifyDatabase extends Command
    }

    /**
+     * Report on things with no linked journals.
+     *
     * @param string $name
     */
    private function reportObject(string $name)
    {
        $plural = str_plural($name);
        $class  = sprintf('FireflyIII\Models\%s', ucfirst($name));
-        $field  = $name == 'tag' ? 'tag' : 'name';
+        $field  = $name === 'tag' ? 'tag' : 'name';
        $set    = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id')
                        ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
                        ->distinct()
@@ -324,22 +394,22 @@ class VerifyDatabase extends Command
    }

    /**
-     *
+     * Report on transfers that have budgets.
     */
    private function reportTransfersBudgets()
    {
        $set = TransactionJournal::distinct()
                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
                                 ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
-                                 ->where('transaction_types.type', TransactionType::TRANSFER)
-                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
+                                 ->whereIn('transaction_types.type', [TransactionType::TRANSFER, TransactionType::DEPOSIT])
+                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*']);

        /** @var TransactionJournal $entry */
        foreach ($set as $entry) {
            $this->error(
                sprintf(
-                    'Error: Transaction journal #%d is a transfer, but has a budget. Edit it without changing anything, so the budget will be removed.',
-                    $entry->id
+                    'Error: Transaction journal #%d is a %s, but has a budget. Edit it without changing anything, so the budget will be removed.',
+                    $entry->id, $entry->transactionType->type
                )
            );
        }
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -1,53 +1,26 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * Kernel.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */

-declare(strict_types=1);
-
 namespace FireflyIII\Console;

-use FireflyIII\Console\Commands\CreateImport;
-use FireflyIII\Console\Commands\EncryptFile;
-use FireflyIII\Console\Commands\Import;
-use FireflyIII\Console\Commands\ScanAttachments;
-use FireflyIII\Console\Commands\UpgradeDatabase;
-use FireflyIII\Console\Commands\UpgradeFireflyInstructions;
-use FireflyIII\Console\Commands\UseEncryption;
-use FireflyIII\Console\Commands\VerifyDatabase;
+use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

 /**
- * Class Kernel
- *
- * @package FireflyIII\Console
+ * File to make sure commnds work.
 */
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The bootstrap classes for the application.
-     *
-     * Next upgrade verify these are the same.
-     *
-     * @var array
-     */
-    protected $bootstrappers
-        = [
-            'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables',
-            'Illuminate\Foundation\Bootstrap\LoadConfiguration',
-            'Illuminate\Foundation\Bootstrap\HandleExceptions',
-            'Illuminate\Foundation\Bootstrap\RegisterFacades',
-            'Illuminate\Foundation\Bootstrap\SetRequestForConsole',
-            'Illuminate\Foundation\Bootstrap\RegisterProviders',
-            'Illuminate\Foundation\Bootstrap\BootProviders',
-        ];
-
    /**
     * The Artisan commands provided by your application.
     *
@@ -55,23 +28,30 @@ class Kernel extends ConsoleKernel
     */
    protected $commands
        = [
-            UpgradeFireflyInstructions::class,
-            VerifyDatabase::class,
-            Import::class,
-            CreateImport::class,
-            EncryptFile::class,
-            ScanAttachments::class,
-            UpgradeDatabase::class,
-            UseEncryption::class,
+            //
        ];

    /**
-     * Register the Closure based commands for the application.
+     * Register the commands for the application.
     *
     * @return void
     */
    protected function commands()
    {
+        $this->load(__DIR__ . '/Commands');
+
        require base_path('routes/console.php');
    }
+
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
+     *
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function schedule(Schedule $schedule)
+    {
+    }
 }
--- a/app/Events/AdminRequestedTestMessage.php
+++ b/app/Events/AdminRequestedTestMessage.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * AdminRequestedTestMessage.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events;
+
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+use Log;
+
+/**
+ * Class AdminRequestedTestMessage
+ *
+ * @package FireflyIII\Events
+ */
+class AdminRequestedTestMessage extends Event
+{
+    use SerializesModels;
+
+    public $ipAddress;
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  User  $user
+     * @param string $ipAddress
+     */
+    public function __construct(User $user, string $ipAddress)
+    {
+        Log::debug(sprintf('Triggered AdminRequestedTestMessage for user #%d (%s) and IP %s!', $user->id, $user->email, $ipAddress));
+        $this->user      = $user;
+        $this->ipAddress = $ipAddress;
+    }
+}
--- a/app/Events/UserChangedEmail.php
+++ b/app/Events/UserChangedEmail.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * UserChangedEmail.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class UserChangedEmail
+ *
+ * @package FireflyIII\Events
+ */
+class UserChangedEmail extends Event
+{
+    use SerializesModels;
+
+    /** @var  string */
+    public $ipAddress;
+    /** @var  string */
+    public $newEmail;
+    /** @var  string */
+    public $oldEmail;
+    /** @var User */
+    public $user;
+
+    /**
+     * UserChangedEmail constructor.
+     *
+     * @param User   $user
+     * @param string $newEmail
+     * @param string $oldEmail
+     * @param string $ipAddress
+     */
+    public function __construct(User $user, string $newEmail, string $oldEmail, string $ipAddress)
+    {
+        $this->user      = $user;
+        $this->ipAddress = $ipAddress;
+        $this->oldEmail  = $oldEmail;
+        $this->newEmail  = $newEmail;
+    }
+}
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,50 +1,45 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * Handler.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */

-declare(strict_types=1);
-
 namespace FireflyIII\Exceptions;

 use ErrorException;
 use Exception;
 use FireflyIII\Jobs\MailError;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\AuthenticationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Session\TokenMismatchException;
-use Illuminate\Validation\ValidationException as ValException;
 use Request;
-use Symfony\Component\HttpKernel\Exception\HttpException;

-/**
- * Class Handler
- *
- * @package FireflyIII\Exceptions
- */
+
 class Handler extends ExceptionHandler
 {
    /**
-     * A list of the exception types that should not be reported.
+     * A list of the inputs that are never flashed for validation exceptions.
+     *
+     * @var array
+     */
+    protected $dontFlash
+        = [
+            'password',
+            'password_confirmation',
+        ];
+    /**
+     * A list of the exception types that are not reported.
     *
     * @var array
     */
    protected $dontReport
        = [
-            AuthenticationException::class,
-            AuthorizationException::class,
-            HttpException::class,
-            ModelNotFoundException::class,
-            TokenMismatchException::class,
-            ValException::class,
+            //
        ];

    /**
@@ -67,14 +62,13 @@ class Handler extends ExceptionHandler
        return parent::render($request, $exception);
    }

-
    /**
     * Report or log an exception.
     *
     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
     *
-     * @param  Exception $exception
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
+     * @param  \Exception $exception
     *
     * @return void
     */
@@ -107,22 +101,7 @@ class Handler extends ExceptionHandler
            dispatch($job);
        }

+
        parent::report($exception);
    }
-
-    /**
-     * Convert an authentication exception into an unauthenticated response.
-     *
-     * @param $request
-     *
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
-     */
-    protected function unauthenticated($request)
-    {
-        if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthenticated.'], 401);
-        }
-
-        return redirect()->guest('login');
-    }
 }
--- a/app/Export/Collector/AttachmentCollector.php
+++ b/app/Export/Collector/AttachmentCollector.php
@@ -122,6 +122,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
     */
    private function getAttachments(): Collection
    {
+        $this->repository->setUser($this->user);
        $attachments = $this->repository->getBetween($this->start, $this->end);

        return $attachments;
--- a/app/Export/Collector/BasicCollector.php
+++ b/app/Export/Collector/BasicCollector.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Export\Collector;


 use FireflyIII\Models\ExportJob;
+use FireflyIII\User;
 use Illuminate\Support\Collection;

 /**
@@ -26,6 +27,8 @@ class BasicCollector
 {
    /** @var ExportJob */
    protected $job;
+    /** @var  User */
+    protected $user;
    /** @var Collection */
    private $entries;

@@ -58,7 +61,16 @@ class BasicCollector
     */
    public function setJob(ExportJob $job)
    {
-        $this->job = $job;
+        $this->job  = $job;
+        $this->user = $job->user;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
    }


--- a/app/Export/Collector/JournalExportCollector.php
+++ b/app/Export/Collector/JournalExportCollector.php
@@ -1,347 +0,0 @@
-<?php
-/**
- * JournalExportCollector.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Export\Collector;
-
-use Carbon\Carbon;
-use DB;
-use FireflyIII\Models\Transaction;
-use Illuminate\Database\Query\JoinClause;
-use Illuminate\Support\Collection;
-use Steam;
-
-/**
- * Class JournalExportCollector
- *
- * @package FireflyIII\Export\Collector
- */
-class JournalExportCollector extends BasicCollector implements CollectorInterface
-{
-    /** @var  Collection */
-    private $accounts;
-    /** @var  Carbon */
-    private $end;
-    /** @var  Carbon */
-    private $start;
-
-    /** @var  Collection */
-    private $workSet;
-
-    /**
-     * @return bool
-     */
-    public function run(): bool
-    {
-        /*
-         * Instead of collecting journals we collect transactions for the given accounts.
-         * We left join the OPPOSING transaction AND some journal data.
-         * After that we complement this info with budgets, categories, etc.
-         *
-         * This is way more efficient and will also work on split journals.
-         */
-        $this->getWorkSet();
-
-        /*
-         * Extract:
-         * possible budget ids for journals
-         * possible category ids journals
-         * possible budget ids for transactions
-         * possible category ids for transactions
-         *
-         * possible IBAN and account numbers?
-         *
-         */
-        $journals     = $this->extractJournalIds();
-        $transactions = $this->extractTransactionIds();
-
-
-        // extend work set with category data from journals:
-        $this->categoryDataForJournals($journals);
-
-        // extend work set with category cate from transactions (overrules journals):
-        $this->categoryDataForTransactions($transactions);
-
-        // same for budgets:
-        $this->budgetDataForJournals($journals);
-        $this->budgetDataForTransactions($transactions);
-
-        $this->setEntries($this->workSet);
-
-        return true;
-    }
-
-    /**
-     * @param Collection $accounts
-     */
-    public function setAccounts(Collection $accounts)
-    {
-        $this->accounts = $accounts;
-    }
-
-    /**
-     * @param Carbon $start
-     * @param Carbon $end
-     */
-    public function setDates(Carbon $start, Carbon $end)
-    {
-        $this->start = $start;
-        $this->end   = $end;
-    }
-
-    /**
-     * @param array $journals
-     *
-     * @return bool
-     */
-    private function budgetDataForJournals(array $journals): bool
-    {
-        $set = DB::table('budget_transaction_journal')
-                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
-                 ->whereIn('budget_transaction_journal.transaction_journal_id', $journals)
-                 ->get(
-                     [
-                         'budget_transaction_journal.budget_id',
-                         'budget_transaction_journal.transaction_journal_id',
-                         'budgets.name',
-                         'budgets.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_journal_id] = ['id' => $obj->budget_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-                if (isset($array[$obj->transaction_journal_id])) {
-                    $obj->budget_id   = $array[$obj->transaction_journal_id]['id'];
-                    $obj->budget_name = $array[$obj->transaction_journal_id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @param array $transactions
-     *
-     * @return bool
-     */
-    private function budgetDataForTransactions(array $transactions): bool
-    {
-        $set = DB::table('budget_transaction')
-                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction.budget_id')
-                 ->whereIn('budget_transaction.transaction_id', $transactions)
-                 ->get(
-                     [
-                         'budget_transaction.budget_id',
-                         'budget_transaction.transaction_id',
-                         'budgets.name',
-                         'budgets.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_id] = ['id' => $obj->budget_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-
-                // first transaction
-                if (isset($array[$obj->id])) {
-                    $obj->budget_id   = $array[$obj->id]['id'];
-                    $obj->budget_name = $array[$obj->id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @param array $journals
-     *
-     * @return bool
-     */
-    private function categoryDataForJournals(array $journals): bool
-    {
-        $set = DB::table('category_transaction_journal')
-                 ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id')
-                 ->whereIn('category_transaction_journal.transaction_journal_id', $journals)
-                 ->get(
-                     [
-                         'category_transaction_journal.category_id',
-                         'category_transaction_journal.transaction_journal_id',
-                         'categories.name',
-                         'categories.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_journal_id] = ['id' => $obj->category_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-                if (isset($array[$obj->transaction_journal_id])) {
-                    $obj->category_id   = $array[$obj->transaction_journal_id]['id'];
-                    $obj->category_name = $array[$obj->transaction_journal_id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @param array $transactions
-     *
-     * @return bool
-     */
-    private function categoryDataForTransactions(array $transactions): bool
-    {
-        $set = DB::table('category_transaction')
-                 ->leftJoin('categories', 'categories.id', '=', 'category_transaction.category_id')
-                 ->whereIn('category_transaction.transaction_id', $transactions)
-                 ->get(
-                     [
-                         'category_transaction.category_id',
-                         'category_transaction.transaction_id',
-                         'categories.name',
-                         'categories.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_id] = ['id' => $obj->category_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-
-                // first transaction
-                if (isset($array[$obj->id])) {
-                    $obj->category_id   = $array[$obj->id]['id'];
-                    $obj->category_name = $array[$obj->id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @return array
-     */
-    private function extractJournalIds(): array
-    {
-        return $this->workSet->pluck('transaction_journal_id')->toArray();
-    }
-
-    /**
-     * @return array
-     */
-    private function extractTransactionIds()
-    {
-        $set      = $this->workSet->pluck('id')->toArray();
-        $opposing = $this->workSet->pluck('opposing_id')->toArray();
-        $complete = $set + $opposing;
-
-        return array_unique($complete);
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    private function getWorkSet()
-    {
-        $accountIds    = $this->accounts->pluck('id')->toArray();
-        $this->workSet = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                    ->leftJoin(
-                                        'transactions AS opposing', function (JoinClause $join) {
-                                        $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
-                                             ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'))
-                                             ->where('transactions.identifier', '=', DB::raw('opposing.identifier'));
-                                    }
-                                    )
-                                    ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
-                                    ->leftJoin('accounts AS opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id')
-                                    ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', 'transaction_types.id')
-                                    ->leftJoin('transaction_currencies', 'transactions.transaction_currency_id', '=', 'transaction_currencies.id')
-                                    ->whereIn('transactions.account_id', $accountIds)
-                                    ->where('transaction_journals.user_id', $this->job->user_id)
-                                    ->where('transaction_journals.date', '>=', $this->start->format('Y-m-d'))
-                                    ->where('transaction_journals.date', '<=', $this->end->format('Y-m-d'))
-                                    ->where('transaction_journals.completed', 1)
-                                    ->whereNull('transaction_journals.deleted_at')
-                                    ->whereNull('transactions.deleted_at')
-                                    ->whereNull('opposing.deleted_at')
-                                    ->orderBy('transaction_journals.date', 'DESC')
-                                    ->orderBy('transactions.identifier', 'ASC')
-                                    ->get(
-                                        [
-                                            'transactions.id',
-                                            'transactions.amount',
-                                            'transactions.description',
-                                            'transactions.account_id',
-                                            'accounts.name as account_name',
-                                            'accounts.encrypted as account_name_encrypted',
-                                            'transactions.identifier',
-
-                                            'opposing.id as opposing_id',
-                                            'opposing.amount AS opposing_amount',
-                                            'opposing.description as opposing_description',
-                                            'opposing.account_id as opposing_account_id',
-                                            'opposing_accounts.name as opposing_account_name',
-                                            'opposing_accounts.encrypted as opposing_account_encrypted',
-                                            'opposing.identifier as opposing_identifier',
-
-                                            'transaction_journals.id as transaction_journal_id',
-                                            'transaction_journals.date',
-                                            'transaction_journals.description as journal_description',
-                                            'transaction_journals.encrypted as journal_encrypted',
-                                            'transaction_journals.transaction_type_id',
-                                            'transaction_types.type as transaction_type',
-                                            'transactions.transaction_currency_id',
-                                            'transaction_currencies.code AS transaction_currency_code',
-
-                                        ]
-                                    );
-    }
-}
--- a/app/Export/Collector/UploadCollector.php
+++ b/app/Export/Collector/UploadCollector.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Export\Collector;

 use Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Log;
 use Storage;

@@ -29,8 +30,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface
    private $exportDisk;
    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
    private $uploadDisk;
-    /** @var string */
-    private $vintageFormat;

    /**
     * AttachmentCollector constructor.
@@ -50,14 +49,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface
    public function run(): bool
    {
        Log::debug('Going to collect attachments', ['key' => $this->job->key]);
-
-        // file names associated with the old import routine.
-        $this->vintageFormat = sprintf('csv-upload-%d-', $this->job->user->id);
-
-        // collect old upload files (names beginning with "csv-upload".
-        $this->collectVintageUploads();
-
-        // then collect current upload files:
        $this->collectModernUploads();

        return true;
@@ -70,7 +61,8 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     */
    private function collectModernUploads(): bool
    {
-        $set  = $this->job->user->importJobs()->where('status', 'import_complete')->get(['import_jobs.*']);
+        $set = $this->job->user->importJobs()->whereIn('status', ['import_complete', 'finished'])->get(['import_jobs.*']);
+        Log::debug(sprintf('Found %d import jobs', $set->count()));
        $keys = [];
        if ($set->count() > 0) {
            $keys = $set->pluck('key')->toArray();
@@ -83,59 +75,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface
        return true;
    }

-    /**
-     * This method collects all the uploads that are uploaded using the "old" importer. So from before the summer of 2016.
-     *
-     * @return bool
-     */
-    private function collectVintageUploads(): bool
-    {
-        // grab upload directory.
-        $files = $this->uploadDisk->files();
-
-        foreach ($files as $entry) {
-            $this->processVintageUpload($entry);
-        }
-
-        return true;
-    }
-
-    /**
-     * This method tells you when the vintage upload file was actually uploaded.
-     *
-     * @param string $entry
-     *
-     * @return string
-     */
-    private function getVintageUploadDate(string $entry): string
-    {
-        // this is an original upload.
-        $parts          = explode('-', str_replace(['.csv.encrypted', $this->vintageFormat], '', $entry));
-        $originalUpload = intval($parts[1]);
-        $date           = date('Y-m-d \a\t H-i-s', $originalUpload);
-
-        return $date;
-    }
-
-    /**
-     * Tells you if a file name is a vintage upload.
-     *
-     * @param string $entry
-     *
-     * @return bool
-     */
-    private function isVintageImport(string $entry): bool
-    {
-        $len = strlen($this->vintageFormat);
-        // file is part of the old import routine:
-        if (substr($entry, 0, $len) === $this->vintageFormat) {
-
-            return true;
-        }
-
-        return false;
-    }
-
    /**
     * @param string $key
     *
@@ -153,7 +92,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
        $content = '';
        try {
            $content = Crypt::decrypt($this->uploadDisk->get(sprintf('%s.upload', $key)));
-        } catch (DecryptException $e) {
+        } catch (FileNotFoundException | DecryptException $e) {
            Log::error(sprintf('Could not decrypt old import file "%s". Skipped because: %s', $key, $e->getMessage()));
        }

@@ -168,47 +107,4 @@ class UploadCollector extends BasicCollector implements CollectorInterface
        return true;
    }

-    /**
-     * If the file is a vintage upload, process it.
-     *
-     * @param string $entry
-     *
-     * @return bool
-     */
-    private function processVintageUpload(string $entry): bool
-    {
-        if ($this->isVintageImport($entry)) {
-            $this->saveVintageImportFile($entry);
-
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * This will store the content of the old vintage upload somewhere.
-     *
-     * @param string $entry
-     */
-    private function saveVintageImportFile(string $entry)
-    {
-        $content = '';
-        try {
-            $content = Crypt::decrypt($this->uploadDisk->get($entry));
-        } catch (DecryptException $e) {
-            Log::error('Could not decrypt old CSV import file ' . $entry . '. Skipped because ' . $e->getMessage());
-        }
-
-        if (strlen($content) > 0) {
-            // add to export disk.
-            $date = $this->getVintageUploadDate($entry);
-            $file = $this->job->key . '-Old import dated ' . $date . '.csv';
-            $this->exportDisk->put($file, $content);
-            $this->getEntries()->push($file);
-        }
-    }
-
-
 }
--- a/app/Export/Entry/Entry.php
+++ b/app/Export/Entry/Entry.php
@@ -13,7 +13,7 @@ declare(strict_types=1);

 namespace FireflyIII\Export\Entry;

-use Steam;
+use FireflyIII\Models\Transaction;

 /**
 * To extend the exported object, in case of new features in Firefly III for example,
@@ -30,6 +30,7 @@ use Steam;
 *
 * Class Entry
 * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.TooManyFields)
 *
 * @package FireflyIII\Export\Entry
 */
@@ -37,24 +38,43 @@ final class Entry
 {
    // @formatter:off
    public $journal_id;
+    public $transaction_id = 0;
+
    public $date;
    public $description;

    public $currency_code;
    public $amount;
+    public $foreign_currency_code = '';
+    public $foreign_amount        = '0';

    public $transaction_type;

-    public $source_account_id;
-    public $source_account_name;
+    public $asset_account_id;
+    public $asset_account_name;
+    public $asset_account_iban;
+    public $asset_account_bic;
+    public $asset_account_number;
+    public $asset_currency_code;

-    public $destination_account_id;
-    public $destination_account_name;
+    public $opposing_account_id;
+    public $opposing_account_name;
+    public $opposing_account_iban;
+    public $opposing_account_bic;
+    public $opposing_account_number;
+    public $opposing_currency_code;

    public $budget_id;
    public $budget_name;
+
    public $category_id;
    public $category_name;
+
+    public $bill_id;
+    public $bill_name;
+
+    public $notes;
+    public $tags;
    // @formatter:on

    /**
@@ -65,32 +85,74 @@ final class Entry
    }

    /**
-     * @param $object
+     * Converts a given transaction (as collected by the collector) into an export entry.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // complex but little choice.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
+     *
+     * @param Transaction $transaction
     *
     * @return Entry
     */
-    public static function fromObject($object): Entry
+    public static function fromTransaction(Transaction $transaction): Entry
    {
-        $entry                           = new self;
-        $entry->journal_id               = $object->transaction_journal_id;
-        $entry->description              = Steam::decrypt(intval($object->journal_encrypted), $object->journal_description);
-        $entry->amount                   = $object->amount;
-        $entry->date                     = $object->date;
-        $entry->transaction_type         = $object->transaction_type;
-        $entry->currency_code            = $object->transaction_currency_code;
-        $entry->source_account_id        = $object->account_id;
-        $entry->source_account_name      = Steam::decrypt(intval($object->account_name_encrypted), $object->account_name);
-        $entry->destination_account_id   = $object->opposing_account_id;
-        $entry->destination_account_name = Steam::decrypt(intval($object->opposing_account_encrypted), $object->opposing_account_name);
-        $entry->category_id              = $object->category_id ?? '';
-        $entry->category_name            = $object->category_name ?? '';
-        $entry->budget_id                = $object->budget_id ?? '';
-        $entry->budget_name              = $object->budget_name ?? '';
-
-        // update description when transaction description is different:
-        if (!is_null($object->description) && $object->description != $entry->description) {
-            $entry->description = $entry->description . ' (' . $object->description . ')';
+        $entry                 = new self;
+        $entry->journal_id     = $transaction->journal_id;
+        $entry->transaction_id = $transaction->id;
+        $entry->date           = $transaction->date->format('Ymd');
+        $entry->description    = $transaction->description;
+        if (strlen(strval($transaction->transaction_description)) > 0) {
+            $entry->description = $transaction->transaction_description . '(' . $transaction->description . ')';
        }
+        $entry->currency_code = $transaction->transactionCurrency->code;
+        $entry->amount        = round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places);
+
+        $entry->foreign_currency_code = is_null($transaction->foreign_currency_id) ? null : $transaction->foreignCurrency->code;
+        $entry->foreign_amount        = is_null($transaction->foreign_currency_id)
+            ? null
+            : strval(
+                round(
+                    $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places
+                )
+            );
+
+        $entry->transaction_type     = $transaction->transaction_type_type;
+        $entry->asset_account_id     = $transaction->account_id;
+        $entry->asset_account_name   = app('steam')->tryDecrypt($transaction->account_name);
+        $entry->asset_account_iban   = $transaction->account_iban;
+        $entry->asset_account_number = $transaction->account_number;
+        $entry->asset_account_bic    = $transaction->account_bic;
+        $entry->asset_currency_code  = $transaction->account_currency_code;
+
+        $entry->opposing_account_id     = $transaction->opposing_account_id;
+        $entry->opposing_account_name   = app('steam')->tryDecrypt($transaction->opposing_account_name);
+        $entry->opposing_account_iban   = $transaction->opposing_account_iban;
+        $entry->opposing_account_number = $transaction->opposing_account_number;
+        $entry->opposing_account_bic    = $transaction->opposing_account_bic;
+        $entry->opposing_currency_code  = $transaction->opposing_currency_code;
+
+        /** budget */
+        $entry->budget_id   = $transaction->transaction_budget_id;
+        $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_budget_name);
+        if (is_null($transaction->transaction_budget_id)) {
+            $entry->budget_id   = $transaction->transaction_journal_budget_id;
+            $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name);
+        }
+
+        /** category */
+        $entry->category_id   = $transaction->transaction_category_id;
+        $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_category_name);
+        if (is_null($transaction->transaction_category_id)) {
+            $entry->category_id   = $transaction->transaction_journal_category_id;
+            $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_journal_category_name);
+        }
+
+        /** budget */
+        $entry->bill_id   = $transaction->bill_id;
+        $entry->bill_name = app('steam')->tryDecrypt($transaction->bill_name);
+
+        $entry->tags  = $transaction->tags;
+        $entry->notes = $transaction->notes;

        return $entry;
    }
--- a/app/Export/ExpandedProcessor.php
+++ b/app/Export/ExpandedProcessor.php
@@ -0,0 +1,346 @@
+<?php
+/**
+ * ExpandedProcessor.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Export;
+
+
+use Crypt;
+use DB;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Export\Collector\AttachmentCollector;
+use FireflyIII\Export\Collector\UploadCollector;
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournalMeta;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use Illuminate\Support\Collection;
+use Log;
+use Storage;
+use ZipArchive;
+
+/**
+ * Class ExpandedProcessor
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // its doing a lot.
+ *
+ * @package FireflyIII\Export
+ */
+class ExpandedProcessor implements ProcessorInterface
+{
+
+    /** @var Collection */
+    public $accounts;
+    /** @var  string */
+    public $exportFormat;
+    /** @var  bool */
+    public $includeAttachments;
+    /** @var  bool */
+    public $includeOldUploads;
+    /** @var  ExportJob */
+    public $job;
+    /** @var array */
+    public $settings;
+    /** @var  Collection */
+    private $exportEntries;
+    /** @var  Collection */
+    private $files;
+    /** @var  Collection */
+    private $journals;
+
+    /**
+     * Processor constructor.
+     */
+    public function __construct()
+    {
+        $this->journals      = new Collection;
+        $this->exportEntries = new Collection;
+        $this->files         = new Collection;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectAttachments(): bool
+    {
+        /** @var AttachmentCollector $attachmentCollector */
+        $attachmentCollector = app(AttachmentCollector::class);
+        $attachmentCollector->setJob($this->job);
+        $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']);
+        $attachmentCollector->run();
+        $this->files = $this->files->merge($attachmentCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * Collects all transaction journals.
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function collectJournals(): bool
+    {
+        // use journal collector thing.
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setUser($this->job->user);
+        $collector->setAccounts($this->accounts)->setRange($this->settings['startDate'], $this->settings['endDate'])
+                  ->withOpposingAccount()->withBudgetInformation()->withCategoryInformation()
+                  ->removeFilter(InternalTransferFilter::class);
+        $transactions = $collector->getJournals();
+        // get some more meta data for each entry:
+        $ids         = $transactions->pluck('journal_id')->toArray();
+        $assetIds    = $transactions->pluck('account_id')->toArray();
+        $opposingIds = $transactions->pluck('opposing_account_id')->toArray();
+        $notes       = $this->getNotes($ids);
+        $tags        = $this->getTags($ids);
+        /** @var array $ibans */
+        $ibans      = $this->getIbans($assetIds) + $this->getIbans($opposingIds);
+        $currencies = $this->getAccountCurrencies($ibans);
+        $transactions->each(
+            function (Transaction $transaction) use ($notes, $tags, $ibans, $currencies) {
+                $journalId                            = intval($transaction->journal_id);
+                $accountId                            = intval($transaction->account_id);
+                $opposingId                           = intval($transaction->opposing_account_id);
+                $currencyId                           = $ibans[$accountId]['currency_id'] ?? 0;
+                $opposingCurrencyId                   = $ibans[$opposingId]['currency_id'] ?? 0;
+                $transaction->notes                   = $notes[$journalId] ?? '';
+                $transaction->tags                    = join(',', $tags[$journalId] ?? []);
+                $transaction->account_number          = $ibans[$accountId]['accountNumber'] ?? '';
+                $transaction->account_bic             = $ibans[$accountId]['BIC'] ?? '';
+                $transaction->account_currency_code   = $currencies[$currencyId] ?? '';
+                $transaction->opposing_account_number = $ibans[$opposingId]['accountNumber'] ?? '';
+                $transaction->opposing_account_bic    = $ibans[$opposingId]['BIC'] ?? '';
+                $transaction->opposing_currency_code  = $currencies[$opposingCurrencyId] ?? '';
+
+            }
+        );
+
+        $this->journals = $transactions;
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectOldUploads(): bool
+    {
+        /** @var UploadCollector $uploadCollector */
+        $uploadCollector = app(UploadCollector::class);
+        $uploadCollector->setJob($this->job);
+        $uploadCollector->run();
+
+        $this->files = $this->files->merge($uploadCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool
+    {
+        $this->journals->each(
+            function (Transaction $transaction) {
+                $this->exportEntries->push(Entry::fromTransaction($transaction));
+            }
+        );
+        Log::debug(sprintf('Count %d entries in exportEntries (convertJournals)', $this->exportEntries->count()));
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws FireflyException
+     */
+    public function createZipFile(): bool
+    {
+        $zip      = new ZipArchive;
+        $file     = $this->job->key . '.zip';
+        $fullPath = storage_path('export') . '/' . $file;
+
+        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
+            throw new FireflyException('Cannot store zip file.');
+        }
+        // for each file in the collection, add it to the zip file.
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $entry) {
+            // is part of this job?
+            $zipFileName = str_replace($this->job->key . '-', '', $entry);
+            $zip->addFromString($zipFileName, $disk->get($entry));
+        }
+
+        $zip->close();
+
+        // delete the files:
+        $this->deleteFiles();
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function exportJournals(): bool
+    {
+        $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
+        $exporter      = app($exporterClass);
+        $exporter->setJob($this->job);
+        $exporter->setEntries($this->exportEntries);
+        $exporter->run();
+        $this->files->push($exporter->getFileName());
+
+        return true;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection
+    {
+        return $this->files;
+    }
+
+    /**
+     * Save export job settings to class.
+     *
+     * @param array $settings
+     */
+    public function setSettings(array $settings)
+    {
+        // save settings
+        $this->settings           = $settings;
+        $this->accounts           = $settings['accounts'];
+        $this->exportFormat       = $settings['exportFormat'];
+        $this->includeAttachments = $settings['includeAttachments'];
+        $this->includeOldUploads  = $settings['includeOldUploads'];
+        $this->job                = $settings['job'];
+    }
+
+    /**
+     *
+     */
+    private function deleteFiles()
+    {
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $file) {
+            $disk->delete($file);
+        }
+    }
+
+    /**
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getAccountCurrencies(array $array): array
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $return     = [];
+        $ids        = [];
+        $repository->setUser($this->job->user);
+        foreach ($array as $value) {
+            $ids[] = $value['currency_id'] ?? 0;
+        }
+        $ids    = array_unique($ids);
+        $result = $repository->getByIds($ids);
+
+        foreach ($result as $currency) {
+            $return[$currency->id] = $currency->code;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Get all IBAN / SWIFT / account numbers
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getIbans(array $array): array
+    {
+        $array  = array_unique($array);
+        $return = [];
+        $set    = AccountMeta::whereIn('account_id', $array)
+                             ->leftJoin('accounts', 'accounts.id', 'account_meta.account_id')
+                             ->where('accounts.user_id', $this->job->user_id)
+                             ->whereIn('account_meta.name', ['accountNumber', 'BIC', 'currency_id'])
+                             ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data']);
+        /** @var AccountMeta $meta */
+        foreach ($set as $meta) {
+            $id                       = intval($meta->account_id);
+            $return[$id][$meta->name] = $meta->data;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns, if present, for the given journal ID's the notes.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getNotes(array $array): array
+    {
+        $array  = array_unique($array);
+        $set    = TransactionJournalMeta::whereIn('journal_meta.transaction_journal_id', $array)
+                                        ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
+                                        ->where('transaction_journals.user_id', $this->job->user_id)
+                                        ->where('journal_meta.name', 'notes')->get(
+                ['journal_meta.transaction_journal_id', 'journal_meta.data', 'journal_meta.id']
+            );
+        $return = [];
+        /** @var TransactionJournalMeta $meta */
+        foreach ($set as $meta) {
+            $id          = intval($meta->transaction_journal_id);
+            $return[$id] = $meta->data;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns a comma joined list of all the users tags linked to these journals.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getTags(array $array): array
+    {
+        $set    = DB::table('tag_transaction_journal')
+                    ->whereIn('tag_transaction_journal.transaction_journal_id', $array)
+                    ->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id')
+                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'tag_transaction_journal.transaction_journal_id')
+                    ->where('transaction_journals.user_id', $this->job->user_id)
+                    ->get(['tag_transaction_journal.transaction_journal_id', 'tags.tag']);
+        $result = [];
+        foreach ($set as $entry) {
+            $id            = intval($entry->transaction_journal_id);
+            $result[$id]   = isset($result[$id]) ? $result[$id] : [];
+            $result[$id][] = Crypt::decrypt($entry->tag);
+        }
+
+        return $result;
+    }
+}
--- a/app/Export/Exporter/CsvExporter.php
+++ b/app/Export/Exporter/CsvExporter.php
@@ -58,8 +58,12 @@ class CsvExporter extends BasicExporter implements ExporterInterface

        // get field names for header row:
        $first   = $this->getEntries()->first();
-        $headers = array_keys(get_object_vars($first));
-        $rows[]  = $headers;
+        $headers = [];
+        if (!is_null($first)) {
+            $headers = array_keys(get_object_vars($first));
+        }
+
+        $rows[] = $headers;

        /** @var Entry $entry */
        foreach ($this->getEntries() as $entry) {
--- a/app/Export/Processor.php
+++ b/app/Export/Processor.php
@@ -1,203 +0,0 @@
-<?php
-/**
- * Processor.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Export;
-
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Export\Collector\AttachmentCollector;
-use FireflyIII\Export\Collector\JournalExportCollector;
-use FireflyIII\Export\Collector\UploadCollector;
-use FireflyIII\Export\Entry\Entry;
-use FireflyIII\Models\ExportJob;
-use Illuminate\Support\Collection;
-use Log;
-use Storage;
-use ZipArchive;
-
-/**
- * Class Processor
- *
- * @package FireflyIII\Export
- */
-class Processor implements ProcessorInterface
-{
-
-    /** @var Collection */
-    public $accounts;
-    /** @var  string */
-    public $exportFormat;
-    /** @var  bool */
-    public $includeAttachments;
-    /** @var  bool */
-    public $includeOldUploads;
-    /** @var  ExportJob */
-    public $job;
-    /** @var array */
-    public $settings;
-    /** @var  Collection */
-    private $exportEntries;
-    /** @var  Collection */
-    private $files;
-    /** @var  Collection */
-    private $journals;
-
-    /**
-     * Processor constructor.
-     */
-    public function __construct()
-    {
-        $this->journals      = new Collection;
-        $this->exportEntries = new Collection;
-        $this->files         = new Collection;
-
-    }
-
-    /**
-     * @return bool
-     */
-    public function collectAttachments(): bool
-    {
-        /** @var AttachmentCollector $attachmentCollector */
-        $attachmentCollector = app(AttachmentCollector::class);
-        $attachmentCollector->setJob($this->job);
-        $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']);
-        $attachmentCollector->run();
-        $this->files = $this->files->merge($attachmentCollector->getEntries());
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function collectJournals(): bool
-    {
-        /** @var JournalExportCollector $collector */
-        $collector = app(JournalExportCollector::class);
-        $collector->setJob($this->job);
-        $collector->setDates($this->settings['startDate'], $this->settings['endDate']);
-        $collector->setAccounts($this->settings['accounts']);
-        $collector->run();
-        $this->journals = $collector->getEntries();
-        Log::debug(sprintf('Count %d journals in collectJournals() ', $this->journals->count()));
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function collectOldUploads(): bool
-    {
-        /** @var UploadCollector $uploadCollector */
-        $uploadCollector = app(UploadCollector::class);
-        $uploadCollector->setJob($this->job);
-        $uploadCollector->run();
-
-        $this->files = $this->files->merge($uploadCollector->getEntries());
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function convertJournals(): bool
-    {
-        $count = 0;
-        foreach ($this->journals as $object) {
-            $this->exportEntries->push(Entry::fromObject($object));
-            $count++;
-        }
-        Log::debug(sprintf('Count %d entries in exportEntries (convertJournals)', $this->exportEntries->count()));
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     * @throws FireflyException
-     */
-    public function createZipFile(): bool
-    {
-        $zip      = new ZipArchive;
-        $file     = $this->job->key . '.zip';
-        $fullPath = storage_path('export') . '/' . $file;
-
-        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
-            throw new FireflyException('Cannot store zip file.');
-        }
-        // for each file in the collection, add it to the zip file.
-        $disk = Storage::disk('export');
-        foreach ($this->getFiles() as $entry) {
-            // is part of this job?
-            $zipFileName = str_replace($this->job->key . '-', '', $entry);
-            $zip->addFromString($zipFileName, $disk->get($entry));
-        }
-
-        $zip->close();
-
-        // delete the files:
-        $this->deleteFiles();
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function exportJournals(): bool
-    {
-        $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
-        $exporter      = app($exporterClass);
-        $exporter->setJob($this->job);
-        $exporter->setEntries($this->exportEntries);
-        $exporter->run();
-        $this->files->push($exporter->getFileName());
-
-        return true;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getFiles(): Collection
-    {
-        return $this->files;
-    }
-
-    /**
-     * @param array $settings
-     */
-    public function setSettings(array $settings)
-    {
-        // save settings
-        $this->settings           = $settings;
-        $this->accounts           = $settings['accounts'];
-        $this->exportFormat       = $settings['exportFormat'];
-        $this->includeAttachments = $settings['includeAttachments'];
-        $this->includeOldUploads  = $settings['includeOldUploads'];
-        $this->job                = $settings['job'];
-    }
-
-    /**
-     *
-     */
-    private function deleteFiles()
-    {
-        $disk = Storage::disk('export');
-        foreach ($this->getFiles() as $file) {
-            $disk->delete($file);
-        }
-    }
-}
--- a/app/Generator/Chart/Basic/ChartJsGenerator.php
+++ b/app/Generator/Chart/Basic/ChartJsGenerator.php
@@ -110,7 +110,14 @@ class ChartJsGenerator implements GeneratorInterface
        ];

        // sort by value, keep keys.
+        // different sort when values are positive and when they're negative.
        asort($data);
+        $next = next($data);
+        if (!is_bool($next) && bccomp($next, '0') === 1) {
+            // next is positive, sort other way around.
+            arsort($data);
+        }
+        unset($next);

        $index = 0;
        foreach ($data as $key => $value) {
--- a/app/Generator/Report/Audit/MonthReportGenerator.php
+++ b/app/Generator/Report/Audit/MonthReportGenerator.php
@@ -145,6 +145,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
     * @param Carbon  $date
     *
     * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // not that long
+     *
     */
    private function getAuditReport(Account $account, Carbon $date): array
    {
@@ -175,9 +178,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
            $transaction->currency = $currency;
        }

-        /*
-         * Reverse set again.
-         */
        $return = [
            'journals'         => $journals->reverse(),
            'exists'           => $journals->count() > 0,
--- a/app/Handlers/Events/AdminEventHandler.php
+++ b/app/Handlers/Events/AdminEventHandler.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * AdminEventHandler.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\AdminRequestedTestMessage;
+use FireflyIII\Mail\AdminTestMail;
+use Log;
+use Mail;
+use Session;
+use Swift_TransportException;
+
+/**
+ * Class AdminEventHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class AdminEventHandler
+{
+    /**
+     * @param AdminRequestedTestMessage $event
+     *
+     * @return bool
+     */
+    public function sendTestMessage(AdminRequestedTestMessage $event): bool
+    {
+
+        $email     = $event->user->email;
+        $ipAddress = $event->ipAddress;
+
+        Log::debug(sprintf('Now in sendTestMessage event handler. Email is %s, IP is %s', $email, $ipAddress));
+        try {
+            Log::debug('Trying to send message...');
+            Mail::to($email)->send(new AdminTestMail($email, $ipAddress));
+            // @codeCoverageIgnoreStart
+        } catch (Swift_TransportException $e) {
+            Log::debug('Send message failed! :(');
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
+            Session::flash('error', 'Possible email error: ' . $e->getMessage());
+        }
+        Log::debug('If no error above this line, message was sent.');
+
+        // @codeCoverageIgnoreEnd
+        return true;
+    }
+}
--- a/app/Handlers/Events/StoredJournalEventHandler.php
+++ b/app/Handlers/Events/StoredJournalEventHandler.php
@@ -19,8 +19,8 @@ use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface as JRI;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
-use FireflyIII\Rules\Processor;
 use FireflyIII\Support\Events\BillScanner;
+use FireflyIII\TransactionRules\Processor;
 use Log;

 /**
@@ -57,11 +57,12 @@ class StoredJournalEventHandler
    /**
     * This method connects a new transfer to a piggy bank.
     *
-     *
-     *
     * @param StoredTransactionJournal $event
     *
     * @return bool
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
     */
    public function connectToPiggyBank(StoredTransactionJournal $event): bool
    {
--- a/app/Handlers/Events/UpdatedJournalEventHandler.php
+++ b/app/Handlers/Events/UpdatedJournalEventHandler.php
@@ -18,8 +18,8 @@ use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
-use FireflyIII\Rules\Processor;
 use FireflyIII\Support\Events\BillScanner;
+use FireflyIII\TransactionRules\Processor;

 /**
 * @codeCoverageIgnore
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -15,11 +15,15 @@ namespace FireflyIII\Handlers\Events;

 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
+use FireflyIII\Events\UserChangedEmail;
+use FireflyIII\Mail\ConfirmEmailChangeMail;
 use FireflyIII\Mail\RegisteredUser as RegisteredUserMail;
 use FireflyIII\Mail\RequestedNewPassword as RequestedNewPasswordMail;
+use FireflyIII\Mail\UndoEmailChangeMail;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Log;
 use Mail;
+use Preferences;
 use Swift_TransportException;

 /**
@@ -54,6 +58,54 @@ class UserEventHandler
        return true;
    }

+    /**
+     * @param UserChangedEmail $event
+     *
+     * @return bool
+     */
+    public function sendEmailChangeConfirmMail(UserChangedEmail $event): bool
+    {
+        $newEmail  = $event->newEmail;
+        $oldEmail  = $event->oldEmail;
+        $user      = $event->user;
+        $ipAddress = $event->ipAddress;
+        $token     = Preferences::getForUser($user, 'email_change_confirm_token', 'invalid');
+        $uri       = route('profile.confirm-email-change', [$token->data]);
+        try {
+            Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $uri, $ipAddress));
+            // @codeCoverageIgnoreStart
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        // @codeCoverageIgnoreEnd
+        return true;
+    }
+
+    /**
+     * @param UserChangedEmail $event
+     *
+     * @return bool
+     */
+    public function sendEmailChangeUndoMail(UserChangedEmail $event): bool
+    {
+        $newEmail  = $event->newEmail;
+        $oldEmail  = $event->oldEmail;
+        $user      = $event->user;
+        $ipAddress = $event->ipAddress;
+        $token     = Preferences::getForUser($user, 'email_change_undo_token', 'invalid');
+        $uri       = route('profile.undo-email-change', [$token->data, hash('sha256', $oldEmail)]);
+        try {
+            Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $uri, $ipAddress));
+            // @codeCoverageIgnoreStart
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        // @codeCoverageIgnoreEnd
+        return true;
+    }
+
    /**
     * @param RequestedNewPassword $event
     *
--- a/app/Helpers/Attachments/AttachmentHelper.php
+++ b/app/Helpers/Attachments/AttachmentHelper.php
@@ -99,7 +99,7 @@ class AttachmentHelper implements AttachmentHelperInterface
     *
     * @return bool
     */
-    public function saveAttachmentsForModel(Model $model, array $files = null): bool
+    public function saveAttachmentsForModel(Model $model, ?array $files): bool
    {
        if (is_array($files)) {
            foreach ($files as $entry) {
@@ -169,7 +169,6 @@ class AttachmentHelper implements AttachmentHelperInterface

        // store it:
        $this->uploadDisk->put($attachment->fileName(), $encrypted);
-
        $attachment->uploaded = 1; // update attachment
        $attachment->save();
        $this->attachments->push($attachment);
@@ -180,8 +179,6 @@ class AttachmentHelper implements AttachmentHelperInterface

        // return it.
        return $attachment;
-
-
    }

    /**
--- a/app/Helpers/Attachments/AttachmentHelperInterface.php
+++ b/app/Helpers/Attachments/AttachmentHelperInterface.php
@@ -55,6 +55,6 @@ interface AttachmentHelperInterface
     *
     * @return bool
     */
-    public function saveAttachmentsForModel(Model $model, array $files = null): bool;
+    public function saveAttachmentsForModel(Model $model, ?array $files): bool;

 }
--- a/app/Helpers/Chart/MetaPieChart.php
+++ b/app/Helpers/Chart/MetaPieChart.php
@@ -32,6 +32,8 @@ use Steam;
 * Class MetaPieChart
 *
 * @package FireflyIII\Helpers\Chart
+ *
+ *
 */
 class MetaPieChart implements MetaPieChartInterface
 {
@@ -83,12 +85,15 @@ class MetaPieChart implements MetaPieChartInterface
     * @param string $group
     *
     * @return array
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
     */
    public function generate(string $direction, string $group): array
    {
        $transactions = $this->getTransactions($direction);
        $grouped      = $this->groupByFields($transactions, $this->grouping[$group]);
        $chartData    = $this->organizeByType($group, $grouped);
+        $key          = strval(trans('firefly.everything_else'));

        // also collect all other transactions
        if ($this->collectOtherObjects && $direction === 'expense') {
@@ -96,11 +101,12 @@ class MetaPieChart implements MetaPieChartInterface
            $collector = app(JournalCollectorInterface::class);
            $collector->setUser($this->user);
            $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::WITHDRAWAL]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcmul($sum, '-1');
-            $sum                                                 = bcsub($sum, $this->total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+
+            $journals        = $collector->getJournals();
+            $sum             = strval($journals->sum('transaction_amount'));
+            $sum             = bcmul($sum, '-1');
+            $sum             = bcsub($sum, $this->total);
+            $chartData[$key] = $sum;
        }

        if ($this->collectOtherObjects && $direction === 'income') {
@@ -108,10 +114,10 @@ class MetaPieChart implements MetaPieChartInterface
            $collector = app(JournalCollectorInterface::class);
            $collector->setUser($this->user);
            $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcsub($sum, $this->total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+            $journals        = $collector->getJournals();
+            $sum             = strval($journals->sum('transaction_amount'));
+            $sum             = bcsub($sum, $this->total);
+            $chartData[$key] = $sum;
        }

        return $chartData;
@@ -258,12 +264,9 @@ class MetaPieChart implements MetaPieChartInterface
            $collector->removeFilter(TransferFilter::class);
        }

-        if ($this->budgets->count() > 0) {
-            $collector->setBudgets($this->budgets);
-        }
-        if ($this->categories->count() > 0) {
-            $collector->setCategories($this->categories);
-        }
+        $collector->setBudgets($this->budgets);
+        $collector->setCategories($this->categories);
+
        if ($this->tags->count() > 0) {
            $collector->setTags($this->tags);
            $collector->withCategoryInformation();
@@ -278,6 +281,9 @@ class MetaPieChart implements MetaPieChartInterface
     * @param array      $fields
     *
     * @return array
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
     */
    protected function groupByFields(Collection $set, array $fields): array
    {
--- a/app/Helpers/Collection/BalanceLine.php
+++ b/app/Helpers/Collection/BalanceLine.php
@@ -147,13 +147,13 @@ class BalanceLine
        if ($this->getBudget() instanceof BudgetModel && !is_null($this->getBudget()->id)) {
            return $this->getBudget()->name;
        }
-        if ($this->getRole() == self::ROLE_DEFAULTROLE) {
+        if ($this->getRole() === self::ROLE_DEFAULTROLE) {
            return strval(trans('firefly.no_budget'));
        }
-        if ($this->getRole() == self::ROLE_TAGROLE) {
+        if ($this->getRole() === self::ROLE_TAGROLE) {
            return strval(trans('firefly.coveredWithTags'));
        }
-        if ($this->getRole() == self::ROLE_DIFFROLE) {
+        if ($this->getRole() === self::ROLE_DIFFROLE) {
            return strval(trans('firefly.leftUnbalanced'));
        }

--- a/app/Helpers/Collection/Bill.php
+++ b/app/Helpers/Collection/Bill.php
@@ -96,7 +96,7 @@ class Bill
    {
        $set = $this->bills->sortBy(
            function (BillLine $bill) {
-                $active = intval($bill->getBill()->active) == 0 ? 1 : 0;
+                $active = intval($bill->getBill()->active) === 0 ? 1 : 0;
                $name   = $bill->getBill()->name;

                return $active . $name;
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -15,7 +15,6 @@ namespace FireflyIII\Helpers\Collector;


 use Carbon\Carbon;
-use Crypt;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Filter\FilterInterface;
@@ -31,7 +30,6 @@ use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
-use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -45,6 +43,9 @@ use Steam;
 * Class JournalCollector
 *
 * @package FireflyIII\Helpers\Collector
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
 */
 class JournalCollector implements JournalCollectorInterface
 {
@@ -64,34 +65,32 @@ class JournalCollector implements JournalCollectorInterface
            'transaction_journals.bill_id',
            'bills.name as bill_name',
            'bills.name_encrypted as bill_name_encrypted',
-            'transactions.id as id',

+            'transactions.id as id',
            'transactions.description as transaction_description',
            'transactions.account_id',
            'transactions.identifier',
            'transactions.transaction_journal_id',
-
            'transactions.amount as transaction_amount',
-
            'transactions.transaction_currency_id as transaction_currency_id',
+
            'transaction_currencies.code as transaction_currency_code',
            'transaction_currencies.symbol as transaction_currency_symbol',
            'transaction_currencies.decimal_places as transaction_currency_dp',

            'transactions.foreign_amount as transaction_foreign_amount',
            'transactions.foreign_currency_id as foreign_currency_id',
+
            'foreign_currencies.code as foreign_currency_code',
            'foreign_currencies.symbol as foreign_currency_symbol',
            'foreign_currencies.decimal_places as foreign_currency_dp',

            'accounts.name as account_name',
            'accounts.encrypted as account_encrypted',
+            'accounts.iban as account_iban',
            'account_types.type as account_type',
+
        ];
-    /** @var  bool */
-    private $filterInternalTransfers;
-    /** @var  bool */
-    private $filterTransfers = false;
    /** @var array */
    private $filters = [InternalTransferFilter::class];

@@ -124,7 +123,7 @@ class JournalCollector implements JournalCollectorInterface
    public function addFilter(string $filter): JournalCollectorInterface
    {
        $interfaces = class_implements($filter);
-        if (in_array(FilterInterface::class, $interfaces)) {
+        if (in_array(FilterInterface::class, $interfaces) && !in_array($filter, $this->filters) ) {
            Log::debug(sprintf('Enabled filter %s', $filter));
            $this->filters[] = $filter;
        }
@@ -177,12 +176,10 @@ class JournalCollector implements JournalCollectorInterface
                if (!is_null($transaction->bill_name)) {
                    $transaction->bill_name = Steam::decrypt(intval($transaction->bill_name_encrypted), $transaction->bill_name);
                }
+                $transaction->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name);
+                $transaction->account_iban          = app('steam')->tryDecrypt($transaction->account_iban);
+                $transaction->opposing_account_iban = app('steam')->tryDecrypt($transaction->opposing_account_iban);

-                try {
-                    $transaction->opposing_account_name = Crypt::decrypt($transaction->opposing_account_name);
-                } catch (DecryptException $e) {
-                    // if this fails its already decrypted.
-                }

            }
        );
@@ -238,7 +235,6 @@ class JournalCollector implements JournalCollectorInterface

        if ($accounts->count() > 1) {
            $this->addFilter(TransferFilter::class);
-            $this->filterTransfers = true;
        }


@@ -262,7 +258,6 @@ class JournalCollector implements JournalCollectorInterface

        if ($accounts->count() > 1) {
            $this->addFilter(TransferFilter::class);
-            $this->filterTransfers = true;
        }

        return $this;
@@ -315,6 +310,7 @@ class JournalCollector implements JournalCollectorInterface
            return $this;
        }
        $this->joinBudgetTables();
+        Log::debug('Journal collector will filter for budgets', $budgetIds);

        $this->query->where(
            function (EloquentBuilder $q) use ($budgetIds) {
@@ -401,6 +397,10 @@ class JournalCollector implements JournalCollectorInterface
     */
    public function setPage(int $page): JournalCollectorInterface
    {
+        if ($page < 1) {
+            $page = 1;
+        }
+
        $this->page = $page;

        if ($page > 0) {
@@ -413,10 +413,10 @@ class JournalCollector implements JournalCollectorInterface
            $this->offset = $offset;
            $this->query->skip($offset);
            Log::debug(sprintf('Changed offset to %d', $offset));
+
+            return $this;
        }
-        if (is_null($this->limit)) {
-            Log::debug('The limit is zero, cannot set the page.');
-        }
+        Log::debug('The limit is zero, cannot set the page.');

        return $this;
    }
@@ -430,8 +430,11 @@ class JournalCollector implements JournalCollectorInterface
    public function setRange(Carbon $start, Carbon $end): JournalCollectorInterface
    {
        if ($start <= $end) {
-            $this->query->where('transaction_journals.date', '>=', $start->format('Y-m-d'));
-            $this->query->where('transaction_journals.date', '<=', $end->format('Y-m-d'));
+            $startStr = $start->format('Y-m-d');
+            $endStr   = $end->format('Y-m-d');
+            $this->query->where('transaction_journals.date', '>=', $startStr);
+            $this->query->where('transaction_journals.date', '<=', $endStr);
+            Log::debug(sprintf('JournalCollector range is now %s - %s (inclusive)', $startStr, $endStr));
        }

        return $this;
@@ -508,7 +511,8 @@ class JournalCollector implements JournalCollectorInterface
                            ->where('transaction_journals.user_id', $this->user->id)
                            ->orderBy('transaction_journals.date', 'DESC')
                            ->orderBy('transaction_journals.order', 'ASC')
-                            ->orderBy('transaction_journals.id', 'DESC');
+                            ->orderBy('transaction_journals.id', 'DESC')
+                            ->orderBy('transaction_journals.description', 'DESC');

        $this->query = $query;

@@ -618,6 +622,8 @@ class JournalCollector implements JournalCollectorInterface
            $this->query->leftJoin('budgets as transaction_journal_budgets', 'transaction_journal_budgets.id', '=', 'budget_transaction_journal.budget_id');
            $this->query->leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id');
            $this->query->leftJoin('budgets as transaction_budgets', 'transaction_budgets.id', '=', 'budget_transaction.budget_id');
+            $this->query->whereNull('transaction_journal_budgets.deleted_at');
+            $this->query->whereNull('transaction_budgets.deleted_at');

            $this->fields[] = 'budget_transaction_journal.budget_id as transaction_journal_budget_id';
            $this->fields[] = 'transaction_journal_budgets.encrypted as transaction_journal_budget_encrypted';
@@ -674,9 +680,12 @@ class JournalCollector implements JournalCollectorInterface
            $this->query->leftJoin('account_types as opposing_account_types', 'opposing_accounts.account_type_id', '=', 'opposing_account_types.id');
            $this->query->whereNull('opposing.deleted_at');

-            $this->fields[]       = 'opposing.account_id as opposing_account_id';
-            $this->fields[]       = 'opposing_accounts.name as opposing_account_name';
-            $this->fields[]       = 'opposing_accounts.encrypted as opposing_account_encrypted';
+            $this->fields[] = 'opposing.id as opposing_id';
+            $this->fields[] = 'opposing.account_id as opposing_account_id';
+            $this->fields[] = 'opposing_accounts.name as opposing_account_name';
+            $this->fields[] = 'opposing_accounts.encrypted as opposing_account_encrypted';
+            $this->fields[] = 'opposing_accounts.iban as opposing_account_iban';
+
            $this->fields[]       = 'opposing_account_types.type as opposing_account_type';
            $this->joinedOpposing = true;
            Log::debug('joinedOpposing is now true!');
--- a/app/Helpers/Filter/TransferFilter.php
+++ b/app/Helpers/Filter/TransferFilter.php
@@ -41,11 +41,13 @@ class TransferFilter implements FilterInterface
                continue;
            }
            // make property string:
-            $journalId  = $transaction->transaction_journal_id;
-            $amount     = Steam::positive($transaction->transaction_amount);
-            $accountIds = [intval($transaction->account_id), intval($transaction->opposing_account_id)];
+            $journalId      = $transaction->transaction_journal_id;
+            $amount         = Steam::positive($transaction->transaction_amount);
+            $accountIds     = [intval($transaction->account_id), intval($transaction->opposing_account_id)];
+            $transactionIds = [$transaction->id, intval($transaction->opposing_id)];
            sort($accountIds);
-            $key = $journalId . '-' . join(',', $accountIds) . '-' . $amount;
+            sort($transactionIds);
+            $key = $journalId . '-' . join(',', $transactionIds) . '-' . join(',', $accountIds) . '-' . $amount;
            if (!isset($count[$key])) {
                // not yet counted? add to new set and count it:
                $new->push($transaction);
--- a/app/Helpers/Help/Help.php
+++ b/app/Helpers/Help/Help.php
@@ -27,6 +27,7 @@ use Route;
 */
 class Help implements HelpInterface
 {
+    const CACHEKEY = 'help_%s_%s';
    /** @var string */
    protected $userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36';

@@ -38,7 +39,7 @@ class Help implements HelpInterface
     */
    public function getFromCache(string $route, string $language): string
    {
-        $line = sprintf('help.%s.%s', $route, $language);
+        $line = sprintf(self::CACHEKEY, $route, $language);

        return Cache::get($line);
    }
@@ -64,12 +65,12 @@ class Help implements HelpInterface
            return '';
        }

-
        Log::debug(sprintf('Status code is %d', $result->status_code));

        if ($result->status_code === 200) {
            $content = trim($result->body);
        }
+
        if (strlen($content) > 0) {
            Log::debug('Content is longer than zero. Expect something.');
            $converter = new CommonMarkConverter();
@@ -98,7 +99,7 @@ class Help implements HelpInterface
     */
    public function inCache(string $route, string $language): bool
    {
-        $line   = sprintf('help.%s.%s', $route, $language);
+        $line   = sprintf(self::CACHEKEY, $route, $language);
        $result = Cache::has($line);
        if ($result) {
            Log::debug(sprintf('Cache has this entry: %s', 'help.' . $route . '.' . $language));
@@ -120,7 +121,7 @@ class Help implements HelpInterface
     */
    public function putInCache(string $route, string $language, string $content)
    {
-        $key = sprintf('help.%s.%s', $route, $language);
+        $key = sprintf(self::CACHEKEY, $route, $language);
        if (strlen($content) > 0) {
            Log::debug(sprintf('Will store entry in cache: %s', $key));
            Cache::put($key, $content, 10080); // a week.
--- a/app/Helpers/Report/BalanceReportHelper.php
+++ b/app/Helpers/Report/BalanceReportHelper.php
@@ -14,16 +14,12 @@ declare(strict_types=1);
 namespace FireflyIII\Helpers\Report;

 use Carbon\Carbon;
-use DB;
 use FireflyIII\Helpers\Collection\Balance;
 use FireflyIII\Helpers\Collection\BalanceEntry;
 use FireflyIII\Helpers\Collection\BalanceHeader;
 use FireflyIII\Helpers\Collection\BalanceLine;
 use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Models\Tag;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 use Log;

@@ -71,17 +67,14 @@ class BalanceReportHelper implements BalanceReportHelperInterface

        /** @var BudgetLimit $budgetLimit */
        foreach ($budgetLimits as $budgetLimit) {
-            $line = $this->createBalanceLine($budgetLimit, $accounts);
-            $balance->addBalanceLine($line);
+            if (!is_null($budgetLimit->budget)) {
+                $line = $this->createBalanceLine($budgetLimit, $accounts);
+                $balance->addBalanceLine($line);
+            }
        }
-        Log::debug('Create rest of the things.');
-        $noBudgetLine       = $this->createNoBudgetLine($accounts, $start, $end);
-        $coveredByTagLine   = $this->createTagsBalanceLine($accounts, $start, $end);
-        $leftUnbalancedLine = $this->createLeftUnbalancedLine($noBudgetLine, $coveredByTagLine);
+        $noBudgetLine = $this->createNoBudgetLine($accounts, $start, $end);

        $balance->addBalanceLine($noBudgetLine);
-        $balance->addBalanceLine($coveredByTagLine);
-        $balance->addBalanceLine($leftUnbalancedLine);
        $balance->setBalanceHeader($header);

        Log::debug('Clear unused budgets.');
@@ -93,54 +86,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
        return $balance;
    }

-    /**
-     * This method collects all transfers that are part of a "balancing act" tag
-     * and groups the amounts of those transfers by their destination account.
-     *
-     * This is used to indicate which expenses, usually outside of budgets, have been
-     * corrected by transfers from a savings account.
-     *
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return Collection
-     */
-    private function allCoveredByBalancingActs(Collection $accounts, Carbon $start, Carbon $end): Collection
-    {
-        $ids = $accounts->pluck('id')->toArray();
-        $set = auth()->user()->tags()
-                     ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
-                     ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                     ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
-                     ->leftJoin(
-                         'transactions AS t_source', function (JoinClause $join) {
-                         $join->on('transaction_journals.id', '=', 't_source.transaction_journal_id')->where('t_source.amount', '<', 0);
-                     }
-                     )
-                     ->leftJoin(
-                         'transactions AS t_destination', function (JoinClause $join) {
-                         $join->on('transaction_journals.id', '=', 't_destination.transaction_journal_id')->where('t_destination.amount', '>', 0);
-                     }
-                     )
-                     ->where('tags.tagMode', 'balancingAct')
-                     ->where('transaction_types.type', TransactionType::TRANSFER)
-                     ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
-                     ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
-                     ->whereNull('transaction_journals.deleted_at')
-                     ->whereIn('t_source.account_id', $ids)
-                     ->whereIn('t_destination.account_id', $ids)
-                     ->groupBy('t_destination.account_id')
-                     ->get(
-                         [
-                             't_destination.account_id',
-                             DB::raw('SUM(t_destination.amount) AS sum'),
-                         ]
-                     );
-
-        return $set;
-    }
-

    /**
     * @param BudgetLimit $budgetLimit
@@ -168,40 +113,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
        return $line;
    }

-    /**
-     * @param BalanceLine $noBudgetLine
-     * @param BalanceLine $coveredByTagLine
-     *
-     * @return BalanceLine
-     */
-    private function createLeftUnbalancedLine(BalanceLine $noBudgetLine, BalanceLine $coveredByTagLine): BalanceLine
-    {
-        $line = new BalanceLine;
-        $line->setRole(BalanceLine::ROLE_DIFFROLE);
-        $noBudgetEntries = $noBudgetLine->getBalanceEntries();
-        $tagEntries      = $coveredByTagLine->getBalanceEntries();
-
-        foreach ($noBudgetEntries as $entry) {
-            $account  = $entry->getAccount();
-            $tagEntry = $tagEntries->filter(
-                function (BalanceEntry $current) use ($account) {
-                    return $current->getAccount()->id === $account->id;
-                }
-            );
-            if ($tagEntry->first()) {
-                // found corresponding entry. As we should:
-                $newEntry = new BalanceEntry;
-                $newEntry->setAccount($account);
-                $spent = bcadd($tagEntry->first()->getLeft(), $entry->getSpent());
-                $newEntry->setSpent($spent);
-                $line->addBalanceEntry($newEntry);
-            }
-        }
-
-        return $line;
-
-
-    }

    /**
     * @param Collection $accounts
@@ -227,41 +138,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
        return $empty;
    }

-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return BalanceLine
-     */
-    private function createTagsBalanceLine(Collection $accounts, Carbon $start, Carbon $end): BalanceLine
-    {
-        $tags     = new BalanceLine;
-        $tagsLeft = $this->allCoveredByBalancingActs($accounts, $start, $end);
-
-        $tags->setRole(BalanceLine::ROLE_TAGROLE);
-
-        foreach ($accounts as $account) {
-            $leftEntry = $tagsLeft->filter(
-                function (Tag $tag) use ($account) {
-                    return $tag->account_id == $account->id;
-                }
-            );
-            $left      = '0';
-            if (!is_null($leftEntry->first())) {
-                $left = $leftEntry->first()->sum;
-            }
-
-            // balanced by tags
-            $tagEntry = new BalanceEntry;
-            $tagEntry->setAccount($account);
-            $tagEntry->setLeft($left);
-            $tags->addBalanceEntry($tagEntry);
-
-        }
-
-        return $tags;
-    }

    /**
     * @param Balance $balance
--- a/app/Helpers/Report/BudgetReportHelper.php
+++ b/app/Helpers/Report/BudgetReportHelper.php
@@ -42,6 +42,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface

    /**
     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // all the arrays make it long.
     * @param Carbon     $start
     * @param Carbon     $end
     * @param Collection $accounts
@@ -56,7 +57,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
        /** @var Budget $budget */
        foreach ($set as $budget) {
            $budgetLimits = $this->repository->getBudgetLimits($budget, $start, $end);
-            if ($budgetLimits->count() == 0) { // no budget limit(s) for this budget
+            if ($budgetLimits->count() === 0) { // no budget limit(s) for this budget

                $spent = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end);// spent for budget in time range
                if (bccomp($spent, '0') === -1) {
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -13,7 +13,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Amount;
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Exceptions\FireflyException;
@@ -39,6 +38,7 @@ use View;
 * Class AccountController
 *
 * @package FireflyIII\Http\Controllers
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
 */
 class AccountController extends Controller
 {
@@ -72,7 +72,7 @@ class AccountController extends Controller
        $repository         = app(CurrencyRepositoryInterface::class);
        $allCurrencies      = $repository->get();
        $currencySelectList = ExpandedForm::makeSelectList($allCurrencies);
-        $defaultCurrency    = Amount::getDefaultCurrency();
+        $defaultCurrency    = app('amount')->getDefaultCurrency();
        $subTitleIcon       = config('firefly.subIconsByIdentifier.' . $what);
        $subTitle           = trans('firefly.make_new_' . $what . '_account');
        $roles              = [];
@@ -141,9 +141,14 @@ class AccountController extends Controller
    }

    /**
+     * Edit an account.
+     *
     * @param Request $request
     * @param Account $account
     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // long and complex but not that excessively so.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
     * @return View
     */
    public function edit(Request $request, Account $account)
@@ -194,7 +199,7 @@ class AccountController extends Controller

        return view(
            'accounts.edit', compact(
-                               'allCurrencies', 'currencySelectList', 'account', 'currency', 'subTitle', 'subTitleIcon', 'openingBalance', 'what', 'roles'
+                               'allCurrencies', 'currencySelectList', 'account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles', 'preFilled'
                           )
        );
    }
@@ -237,12 +242,17 @@ class AccountController extends Controller


    /**
+     * Show an account.
+     *
     * @param Request                    $request
     * @param JournalRepositoryInterface $repository
     * @param Account                    $account
     * @param string                     $moment
     *
     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // long and complex but not that excessively so.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
     */
    public function show(Request $request, JournalRepositoryInterface $repository, Account $account, string $moment = '')
    {
@@ -253,7 +263,7 @@ class AccountController extends Controller
        $currencyRepos = app(CurrencyRepositoryInterface::class);
        $range         = Preferences::get('viewRange', '1M')->data;
        $subTitleIcon  = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
-        $page          = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page          = intval($request->get('page'));
        $pageSize      = intval(Preferences::get('transactionPageSize', 50)->data);
        $chartUri      = route('chart.account.single', [$account->id]);
        $start         = null;
@@ -274,55 +284,31 @@ class AccountController extends Controller
        if (strlen($moment) > 0 && $moment !== 'all') {
            $start    = new Carbon($moment);
            $end      = Navigation::endOfPeriod($start, $range);
-            $subTitle = trans(
-                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-            );
+            $fStart   = $start->formatLocalized($this->monthAndDayFormat);
+            $fEnd     = $end->formatLocalized($this->monthAndDayFormat);
+            $subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
            $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]);
            $periods  = $this->getPeriodOverview($account);
        }

-        // prep for current period
+        // prep for current period view
        if (strlen($moment) === 0) {
            $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
            $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
-            $subTitle = trans(
-                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-            );
+            $fStart   = $start->formatLocalized($this->monthAndDayFormat);
+            $fEnd     = $end->formatLocalized($this->monthAndDayFormat);
+            $subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
            $periods  = $this->getPeriodOverview($account);
        }

-        $count = 0;
-        $loop  = 0;
-        // grab journals, but be prepared to jump a period back to get the right ones:
-        Log::info('Now at loop start.');
-        while ($count === 0 && $loop < 3) {
-            $loop++;
-            $collector = app(JournalCollectorInterface::class);
-            Log::info('Count is zero, search for journals.');
-            $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
-            if (!is_null($start)) {
-                $collector->setRange($start, $end);
-            }
-            $journals = $collector->getPaginatedJournals();
-            $journals->setPath('accounts/show/' . $account->id . '/' . $moment);
-            $count = $journals->getCollection()->count();
-            if ($count === 0 && $loop < 3) {
-                $start->subDay();
-                $start = Navigation::startOfPeriod($start, $range);
-                $end   = Navigation::endOfPeriod($start, $range);
-                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
-            }
+        // grab journals:
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
+        if (!is_null($start)) {
+            $collector->setRange($start, $end);
        }
-
-        if ($moment != 'all' && $loop > 1) {
-            $subTitle = trans(
-                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-            );
-        }
-
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath(route('accounts.show', [$account->id, $moment]));

        return view(
            'accounts.show',
@@ -346,7 +332,7 @@ class AccountController extends Controller

        // update preferences if necessary:
        $frontPage = Preferences::get('frontPageAccounts', [])->data;
-        if (count($frontPage) > 0) {
+        if (count($frontPage) > 0 && $account->accountType->type === AccountType::ASSET) {
            $frontPage[] = $account->id;
            Preferences::set('frontPageAccounts', $frontPage);
        }
@@ -413,6 +399,8 @@ class AccountController extends Controller
     * @param Account $account The account involved.
     *
     * @return Collection
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
     */
    private function getPeriodOverview(Account $account): Collection
    {
@@ -421,9 +409,9 @@ class AccountController extends Controller
        $start      = $repository->oldestJournalDate($account);
        $range      = Preferences::get('viewRange', '1M')->data;
        $start      = Navigation::startOfPeriod($start, $range);
-        $end        = Navigation::endOfX(new Carbon, $range);
+        $end        = Navigation::endOfX(new Carbon, $range, null);
        $entries    = new Collection;
-
+        $count      = 0;
        // properties for cache
        $cache = new CacheProperties;
        $cache->addProperty($start);
@@ -436,24 +424,20 @@ class AccountController extends Controller
        }

        Log::debug('Going to get period expenses and incomes.');
-        while ($end >= $start) {
+        while ($end >= $start && $count < 90) {
            $end        = Navigation::startOfPeriod($end, $range);
            $currentEnd = Navigation::endOfPeriod($end, $range);

            // try a collector for income:
            /** @var JournalCollectorInterface $collector */
            $collector = app(JournalCollectorInterface::class);
-            $collector->setAccounts(new Collection([$account]))->setRange($end, $currentEnd)
-                      ->setTypes([TransactionType::DEPOSIT])
-                      ->withOpposingAccount();
+            $collector->setAccounts(new Collection([$account]))->setRange($end, $currentEnd)->setTypes([TransactionType::DEPOSIT])->withOpposingAccount();
            $earned = strval($collector->getJournals()->sum('transaction_amount'));

            // try a collector for expenses:
            /** @var JournalCollectorInterface $collector */
            $collector = app(JournalCollectorInterface::class);
-            $collector->setAccounts(new Collection([$account]))->setRange($end, $currentEnd)
-                      ->setTypes([TransactionType::WITHDRAWAL])
-                      ->withOpposingAccount();
+            $collector->setAccounts(new Collection([$account]))->setRange($end, $currentEnd)->setTypes([TransactionType::WITHDRAWAL])->withOpposingAccount();
            $spent    = strval($collector->getJournals()->sum('transaction_amount'));
            $dateStr  = $end->format('Y-m-d');
            $dateName = Navigation::periodShow($end, $range);
@@ -466,7 +450,7 @@ class AccountController extends Controller
                    'date'   => clone $end]
            );
            $end = Navigation::subtractPeriod($end, $range, 1);
-
+            $count++;
        }
        $cache->store($entries);

--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -14,7 +14,11 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Admin;


+use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Log;
+use Session;

 /**
 * Class HomeController
@@ -34,4 +38,19 @@ class HomeController extends Controller
        return view('admin.index', compact('title', 'mainTitleIcon'));
    }

+    /**
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function testMessage(Request $request)
+    {
+        $ipAddress = $request->ip();
+        Log::debug(sprintf('Now in testMessage() controller. IP is %s', $ipAddress));
+        event(new AdminRequestedTestMessage(auth()->user(), $ipAddress));
+        Session::flash('info', strval(trans('firefly.send_test_triggered')));
+
+        return redirect(route('admin.index'));
+    }
+
 }
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * LinkController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Admin;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\LinkTypeFormRequest;
+use FireflyIII\Models\LinkType;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Illuminate\Http\Request;
+use Preferences;
+use View;
+
+/**
+ * Class LinkController
+ *
+ * @package FireflyIII\Http\Controllers\Admin
+ */
+class LinkController extends Controller
+{
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', strval(trans('firefly.administration')));
+                View::share('mainTitleIcon', 'fa-hand-spock-o');
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function create()
+    {
+        $subTitle     = trans('firefly.create_new_link_type');
+        $subTitleIcon = 'fa-link';
+
+        // put previous url in session if not redirect from store (not "create another").
+        if (session('link_types.create.fromStore') !== true) {
+            $this->rememberPreviousUri('link_types.create.uri');
+        }
+
+        return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param Request                     $request
+     * @param LinkTypeRepositoryInterface $repository
+     * @param LinkType                    $linkType
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
+     */
+    public function delete(Request $request, LinkTypeRepositoryInterface $repository, LinkType $linkType)
+    {
+        if (!$linkType->editable) {
+            $request->session()->flash('error', strval(trans('firefly.cannot_edit_link_type', ['name' => $linkType->name])));
+
+            return redirect(route('admin.links.index'));
+        }
+
+        $subTitle   = trans('firefly.delete_link_type', ['name' => $linkType->name]);
+        $otherTypes = $repository->get();
+        $count      = $repository->countJournals($linkType);
+        $moveTo     = [];
+        $moveTo[0]  = trans('firefly.do_not_save_connection');
+        /** @var LinkType $otherType */
+        foreach ($otherTypes as $otherType) {
+            if ($otherType->id !== $linkType->id) {
+                $moveTo[$otherType->id] = sprintf('%s (%s / %s)', $otherType->name, $otherType->inward, $otherType->outward);
+            }
+        }
+        // put previous url in session
+        $this->rememberPreviousUri('link_types.delete.uri');
+
+        return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
+    }
+
+    /**
+     * @param Request                     $request
+     * @param LinkTypeRepositoryInterface $repository
+     * @param LinkType                    $linkType
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(Request $request, LinkTypeRepositoryInterface $repository, LinkType $linkType)
+    {
+        $name   = $linkType->name;
+        $moveTo = $repository->find(intval($request->get('move_link_type_before_delete')));
+        $repository->destroy($linkType, $moveTo);
+
+        $request->session()->flash('success', strval(trans('firefly.deleted_link_type', ['name' => $name])));
+        Preferences::mark();
+
+        return redirect($this->getPreviousUri('link_types.delete.uri'));
+    }
+
+    /**
+     * @param Request  $request
+     * @param LinkType $linkType
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+     */
+    public function edit(Request $request, LinkType $linkType)
+    {
+        if (!$linkType->editable) {
+            $request->session()->flash('error', strval(trans('firefly.cannot_edit_link_type', ['name' => $linkType->name])));
+
+            return redirect(route('admin.links.index'));
+        }
+        $subTitle     = trans('firefly.edit_link_type', ['name' => $linkType->name]);
+        $subTitleIcon = 'fa-link';
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (session('link_types.edit.fromUpdate') !== true) {
+            $this->rememberPreviousUri('link_types.edit.uri');
+        }
+        $request->session()->forget('link_types.edit.fromUpdate');
+
+        return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
+    }
+
+    /**
+     * @param LinkTypeRepositoryInterface $repository
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index(LinkTypeRepositoryInterface $repository)
+    {
+        $subTitle     = trans('firefly.journal_link_configuration');
+        $subTitleIcon = 'fa-link';
+        $linkTypes    = $repository->get();
+        $linkTypes->each(
+            function (LinkType $linkType) use ($repository) {
+                $linkType->journalCount = $repository->countJournals($linkType);
+            }
+        );
+
+        return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
+    }
+
+    /**
+     * @param LinkType $linkType
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function show(LinkType $linkType)
+    {
+        $subTitle     = trans('firefly.overview_for_link', ['name' => $linkType->name]);
+        $subTitleIcon = 'fa-link';
+        $links        = $linkType->transactionJournalLinks()->get();
+
+        return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
+    }
+
+    /**
+     * @param LinkTypeFormRequest         $request
+     * @param LinkTypeRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function store(LinkTypeFormRequest $request, LinkTypeRepositoryInterface $repository)
+    {
+        $data     = [
+            'name'    => $request->string('name'),
+            'inward'  => $request->string('inward'),
+            'outward' => $request->string('outward'),
+        ];
+        $linkType = $repository->store($data);
+        $request->session()->flash('success', strval(trans('firefly.stored_new_link_type', ['name' => $linkType->name])));
+
+        if (intval($request->get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            $request->session()->put('link_types.create.fromStore', true);
+
+            return redirect(route('link_types.create', [$request->input('what')]))->withInput();
+        }
+
+        // redirect to previous URL.
+        return redirect($this->getPreviousUri('link_types.create.uri'));
+    }
+
+    public function update(LinkTypeFormRequest $request, LinkTypeRepositoryInterface $repository, LinkType $linkType)
+    {
+        if (!$linkType->editable) {
+            $request->session()->flash('error', strval(trans('firefly.cannot_edit_link_type', ['name' => $linkType->name])));
+
+            return redirect(route('admin.links.index'));
+        }
+
+        $data = [
+            'name'    => $request->string('name'),
+            'inward'  => $request->string('inward'),
+            'outward' => $request->string('outward'),
+        ];
+        $repository->update($linkType, $data);
+
+        $request->session()->flash('success', strval(trans('firefly.updated_link_type', ['name' => $linkType->name])));
+        Preferences::mark();
+
+        if (intval($request->get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            $request->session()->put('link_types.edit.fromUpdate', true);
+
+            return redirect(route('admin.links.edit', [$linkType->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect($this->getPreviousUri('link_types.edit.uri'));
+    }
+
+}
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -48,6 +48,32 @@ class UserController extends Controller
        );
    }

+    /**
+     * @param User $user
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function delete(User $user)
+    {
+        $subTitle = trans('firefly.delete_user', ['email' => $user->email]);
+
+        return view('admin.users.delete', compact('user', 'subTitle'));
+    }
+
+    /**
+     * @param User                    $user
+     * @param UserRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(User $user, UserRepositoryInterface $repository)
+    {
+        $repository->destroy($user);
+        Session::flash('success', strval(trans('firefly.user_deleted')));
+
+        return redirect(route('admin.users'));
+    }
+
    /**
     * @param User $user
     *
@@ -64,9 +90,10 @@ class UserController extends Controller
        $subTitle     = strval(trans('firefly.edit_user', ['email' => $user->email]));
        $subTitleIcon = 'fa-user-o';
        $codes        = [
-            ''        => strval(trans('firefly.no_block_code')),
-            'bounced' => strval(trans('firefly.block_code_bounced')),
-            'expired' => strval(trans('firefly.block_code_expired')),
+            ''              => strval(trans('firefly.no_block_code')),
+            'bounced'       => strval(trans('firefly.block_code_bounced')),
+            'expired'       => strval(trans('firefly.block_code_expired')),
+            'email_changed' => strval(trans('firefly.block_code_email_changed')),
        ];

        return view('admin.users.edit', compact('user', 'subTitle', 'subTitleIcon', 'codes'));
@@ -143,6 +170,7 @@ class UserController extends Controller
        }

        $repository->changeStatus($user, $data['blocked'], $data['blocked_code']);
+        $repository->updateEmail($user, $data['email']);

        Session::flash('success', strval(trans('firefly.updated_user', ['email' => $user->email])));
        Preferences::mark();
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -99,7 +99,6 @@ class AttachmentController extends Controller
    public function download(AttachmentRepositoryInterface $repository, Attachment $attachment)
    {

-
        if ($repository->exists($attachment)) {
            $content = $repository->getContent($attachment);
            $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
@@ -153,7 +152,7 @@ class AttachmentController extends Controller
        $image = 'images/page_green.png';


-        if ($attachment->mime == 'application/pdf') {
+        if ($attachment->mime === 'application/pdf') {
            $image = 'images/page_white_acrobat.png';
        }
        $file     = public_path($image);
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -1,31 +1,34 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * ForgotPasswordController.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */
-declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Auth;

 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-use Illuminate\Http\Request;
-use Password;

-/**
- * Class ForgotPasswordController
- *
- * @package FireflyIII\Http\Controllers\Auth
- */
 class ForgotPasswordController extends Controller
 {
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
    use SendsPasswordResetEmails;

    /**
@@ -36,37 +39,6 @@ class ForgotPasswordController extends Controller
    {
        parent::__construct();
        $this->middleware('guest');
-    }

-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  Request                $request
-     *
-     * @param UserRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
-    {
-        $this->validate($request, ['email' => 'required|email']);
-
-        // verify if the user is not a demo user. If so, we give him back an error.
-        $user = User::where('email', $request->get('email'))->first();
-
-        if (!is_null($user) && $repository->hasRole($user, 'demo')) {
-            return back()->withErrors(['email' => trans('firefly.cannot_reset_demo_user')]);
-        }
-
-        $response = $this->broker()->sendResetLink($request->only('email'));
-
-        if ($response === Password::RESET_LINK_SENT) {
-            return back()->with('status', trans($response));
-        }
-
-        // If an error was returned by the password broker, we will get this message
-        // translated so we can notify a user of the problem. We'll redirect back
-        // to where the users came from so they can attempt this process again.
-        return back()->withErrors(['email' => trans($response)]); // @codeCoverageIgnore
    }
 }
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -1,38 +1,48 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * LoginController.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */
-declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Auth;

-use Config;
 use FireflyConfig;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\User;
 use Illuminate\Cookie\CookieJar;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
-use Lang;

-/**
- * @codeCoverageIgnore
- *
- * Class LoginController
- *
- * @package FireflyIII\Http\Controllers\Auth
- */
+
 class LoginController extends Controller
 {
+    /*
+    |--------------------------------------------------------------------------
+    | Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles authenticating users for the application and
+    | redirecting them to your home screen. The controller uses a trait
+    | to conveniently provide its functionality to your applications.
+    |
+    */

    use AuthenticatesUsers;

+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
    /**
     * Create a new controller instance.
     *
@@ -40,79 +50,11 @@ class LoginController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware('guest', ['except' => 'logout']);
+        $this->middleware('guest')->except('logout');
    }

    /**
-     * Handle a login request to the application.
-     *
-     * @param Request $request
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
-     */
-    public function login(Request $request)
-    {
-        $this->validateLogin($request);
-        $lockedOut = $this->hasTooManyLoginAttempts($request);
-        if ($lockedOut) {
-            $this->fireLockoutEvent($request);
-
-            return $this->sendLockoutResponse($request);
-        }
-
-        $credentials            = $this->credentials($request);
-        $credentials['blocked'] = 0; // must not be blocked.
-
-        if ($this->guard()->attempt($credentials, $request->has('remember'))) {
-            return $this->sendLoginResponse($request);
-        }
-
-        $errorMessage = $this->getBlockedError($credentials['email']);
-
-        if (!$lockedOut) {
-            $this->incrementLoginAttempts($request);
-        }
-
-        return $this->sendFailedLoginResponse($request, $errorMessage);
-    }
-
-    /**
-     * @param Request   $request
-     * @param CookieJar $cookieJar
-     *
-     * @return $this
-     */
-    public function logout(Request $request, CookieJar $cookieJar)
-    {
-        if (intval(getenv('SANDSTORM')) === 1) {
-            return view('error')->with('message', strval(trans('firefly.sandstorm_not_available')));
-        }
-
-        $cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
-
-        $this->guard()->logout();
-
-        $request->session()->flush();
-
-        $request->session()->regenerate();
-
-        return redirect('/')->withCookie($cookie);
-    }
-
-    /**
-     * @return string
-     */
-    public function redirectTo(): string
-    {
-        return route('index');
-    }
-
-    /**
-     * Show the application login form.
-     *
-     * @param Request   $request
-     *
-     * @param CookieJar $cookieJar
+     * Show the application's login form.
     *
     * @return \Illuminate\Http\Response
     */
@@ -120,8 +62,9 @@ class LoginController extends Controller
    {
        // forget 2fa cookie:
        $cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
+
        // is allowed to?
-        $singleUserMode    = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
        $userCount         = User::count();
        $allowRegistration = true;
        if ($singleUserMode === true && $userCount > 0) {
@@ -133,59 +76,4 @@ class LoginController extends Controller

        return view('auth.login', compact('allowRegistration', 'email', 'remember'))->withCookie($cookie);
    }
-
-    /**
-     * Get the failed login message.
-     *
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function getFailedLoginMessage(string $message)
-    {
-        if (strlen($message) > 0) {
-            return $message;
-        }
-
-        return Lang::has('auth.failed') ? Lang::get('auth.failed') : 'These credentials do not match our records.';
-    }
-
-    /**
-     * Get the failed login response instance.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $message
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    protected function sendFailedLoginResponse(Request $request, string $message)
-    {
-        return redirect()->back()
-                         ->withInput($request->only($this->username(), 'remember'))
-                         ->withErrors(
-                             [
-                                 $this->username() => $this->getFailedLoginMessage($message),
-                             ]
-                         );
-    }
-
-    /**
-     * @param string $email
-     *
-     * @return string
-     */
-    private function getBlockedError(string $email): string
-    {
-        // check if user is blocked:
-        $errorMessage = '';
-        /** @var User $foundUser */
-        $foundUser = User::where('email', $email)->where('blocked', 1)->first();
-        if (!is_null($foundUser)) {
-            // user exists, but is blocked:
-            $code         = strlen(strval($foundUser->blocked_code)) > 0 ? $foundUser->blocked_code : 'general_blocked';
-            $errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $email]));
-        }
-
-        return $errorMessage;
-    }
 }
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -1,88 +0,0 @@
-<?php
-/**
- * PasswordController.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Http\Controllers\Auth;
-
-use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\User;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-use Illuminate\Http\Request;
-use Illuminate\Mail\Message;
-use Illuminate\Support\Facades\Password;
-
-
-/**
- * @codeCoverageIgnore
- *
- * Class PasswordController
- *
- * @package FireflyIII\Http\Controllers\Auth
- * @method getEmailSubject()
- * @method getSendResetLinkEmailSuccessResponse(string $response)
- * @method getSendResetLinkEmailFailureResponse(string $response)
- */
-class PasswordController extends Controller
-{
-
-    use ResetsPasswords;
-
-    /**
-     * Create a new password controller instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->middleware('guest');
-    }
-
-    /**
-     * Send a reset link to the given user.
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 7 but ok
-     *
-     * @param  \Illuminate\Http\Request $request
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function sendResetLinkEmail(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email']);
-
-        $user     = User::whereEmail($request->get('email'))->first();
-        $response = 'passwords.blocked';
-
-        if (is_null($user)) {
-            $response = Password::INVALID_USER;
-        }
-
-        if (!is_null($user) && intval($user->blocked) === 0) {
-            $response = Password::sendResetLink(
-                $request->only('email'), function (Message $message) {
-                $message->subject($this->getEmailSubject());
-            }
-            );
-        }
-
-        switch ($response) {
-            case Password::RESET_LINK_SENT:
-                return $this->getSendResetLinkEmailSuccessResponse($response);
-
-            case Password::INVALID_USER:
-            case 'passwords.blocked':
-            default:
-                return $this->getSendResetLinkEmailFailureResponse($response);
-        }
-    }
-
-}
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -1,42 +1,44 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * RegisterController.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */
-declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Auth;

-use Auth;
-use Config;
 use FireflyConfig;
-use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\User;
+use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 use Session;
-use Validator;

-/**
- * @codeCoverageIgnore
- *
- * Class RegisterController
- *
- * @package FireflyIII\Http\Controllers\Auth
- */
 class RegisterController extends Controller
 {
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */

    use RegistersUsers;

    /**
-     * Where to redirect users after login / registration.
+     * Where to redirect users after registration.
     *
     * @var string
     */
@@ -44,6 +46,7 @@ class RegisterController extends Controller

    /**
     * Create a new controller instance.
+     *
     */
    public function __construct()
    {
@@ -52,14 +55,16 @@ class RegisterController extends Controller
    }

    /**
-     * @param Request $request
+     * Handle a registration request for the application.
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+     * @param  \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\Response
     */
    public function register(Request $request)
    {
        // is allowed to?
-        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
        $userCount      = User::count();
        if ($singleUserMode === true && $userCount > 0) {
            $message = 'Registration is currently not available.';
@@ -67,29 +72,19 @@ class RegisterController extends Controller
            return view('error', compact('message'));
        }

+        $this->validator($request->all())->validate();

-        $validator = $this->validator($request->all());
+        event(new Registered($user = $this->create($request->all())));

-        if ($validator->fails()) {
-            $this->throwValidationException($request, $validator);
-        }
-
-        $user = $this->create($request->all());
-
-        // trigger user registration event:
-        event(new RegisteredUser($user, $request->ip()));
-
-        Auth::login($user);
+        $this->guard()->login($user);

        Session::flash('success', strval(trans('firefly.registered')));
-        Session::flash('gaEventCategory', 'user');
-        Session::flash('gaEventAction', 'new-registration');

-        return redirect($this->redirectPath());
+        return $this->registered($request, $user)
+            ?: redirect($this->redirectPath());
    }

    /**
-     * OLD
     * Show the application registration form.
     *
     * @param Request $request
@@ -99,10 +94,10 @@ class RegisterController extends Controller
    public function showRegistrationForm(Request $request)
    {
        // is demo site?
-        $isDemoSite = FireflyConfig::get('is_demo_site', Config::get('firefly.configuration.is_demo_site'))->data;
+        $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;

        // is allowed to?
-        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
        $userCount      = User::count();
        if ($singleUserMode === true && $userCount > 0) {
            $message = 'Registration is currently not available.';
@@ -112,6 +107,7 @@ class RegisterController extends Controller

        $email = $request->old('email');

+
        return view('auth.register', compact('isDemoSite', 'email'));
    }

@@ -120,19 +116,16 @@ class RegisterController extends Controller
     *
     * @param  array $data
     *
-     * @return User
+     * @return \FireflyIII\User
     */
    protected function create(array $data)
    {
-        /** @var User $user */
-        $user = User::create(
+        return User::create(
            [
                'email'    => $data['email'],
                'password' => bcrypt($data['password']),
            ]
        );
-
-        return $user;
    }

    /**
@@ -146,8 +139,8 @@ class RegisterController extends Controller
    {
        return Validator::make(
            $data, [
-                     'email'    => 'required|email|max:255|unique:users',
-                     'password' => 'required|min:6|confirmed',
+                     'email'    => 'required|string|email|max:255|unique:users',
+                     'password' => 'required|string|secure_password|confirmed',
                 ]
        );
    }
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -1,32 +1,43 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * ResetPasswordController.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */
-declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Auth;

 use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;

-/**
- * @codeCoverageIgnore
- *
- * Class ResetPasswordController
- *
- * @package FireflyIII\Http\Controllers\Auth
- */
 class ResetPasswordController extends Controller
 {
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */

    use ResetsPasswords;

+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
    /**
     * Create a new controller instance.
     *
@@ -34,7 +45,6 @@ class ResetPasswordController extends Controller
    public function __construct()
    {
        parent::__construct();
-
        $this->middleware('guest');
    }
 }
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -34,6 +34,8 @@ class TwoFactorController extends Controller
     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
     */
    public function index(Request $request)
    {
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -129,6 +129,11 @@ class BillController extends Controller
        if (session('bills.edit.fromUpdate') !== true) {
            $this->rememberPreviousUri('bills.edit.uri');
        }
+
+        $currency         = app('amount')->getDefaultCurrency();
+        $bill->amount_min = round($bill->amount_min, $currency->decimal_places);
+        $bill->amount_max = round($bill->amount_max, $currency->decimal_places);
+
        $request->session()->forget('bills.edit.fromUpdate');
        $request->session()->flash('gaEventCategory', 'bills');
        $request->session()->flash('gaEventAction', 'edit');
@@ -175,7 +180,7 @@ class BillController extends Controller
     */
    public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill)
    {
-        if (intval($bill->active) == 0) {
+        if (intval($bill->active) === 0) {
            $request->session()->flash('warning', strval(trans('firefly.cannot_scan_inactive_bill')));

            return redirect(URL::previous());
@@ -206,7 +211,7 @@ class BillController extends Controller
        /** @var Carbon $date */
        $date           = session('start');
        $year           = $date->year;
-        $page           = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $page           = intval($request->get('page'));
        $pageSize       = intval(Preferences::get('transactionPageSize', 50)->data);
        $yearAverage    = $repository->getYearAverage($bill, $date);
        $overallAverage = $repository->getOverallAverage($bill);
@@ -217,7 +222,7 @@ class BillController extends Controller
        $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->setLimit($pageSize)->setPage($page)->withBudgetInformation()
                  ->withCategoryInformation();
        $journals = $collector->getPaginatedJournals();
-        $journals->setPath('/bills/show/' . $bill->id);
+        $journals->setPath(route('bills.show', [$bill->id]));

        $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill, new Carbon);
        $hideBill                = true;
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -13,18 +13,16 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Amount;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Http\Requests\BudgetFormRequest;
 use FireflyIII\Http\Requests\BudgetIncomeRequest;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
@@ -40,6 +38,7 @@ use View;
 * Class BudgetController
 *
 * @package FireflyIII\Http\Controllers
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
 */
 class BudgetController extends Controller
 {
@@ -75,13 +74,11 @@ class BudgetController extends Controller
     */
    public function amount(Request $request, Budget $budget)
    {
-        $amount = intval($request->get('amount'));
-        /** @var Carbon $start */
-        $start = session('start', Carbon::now()->startOfMonth());
-        /** @var Carbon $end */
-        $end         = session('end', Carbon::now()->endOfMonth());
+        $amount      = intval($request->get('amount'));
+        $start       = Carbon::createFromFormat('Y-m-d', $request->get('start'));
+        $end         = Carbon::createFromFormat('Y-m-d', $request->get('end'));
        $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount);
-        if ($amount == 0) {
+        if ($amount === 0) {
            $budgetLimit = null;
        }
        Preferences::mark();
@@ -170,6 +167,9 @@ class BudgetController extends Controller
     * @param string|null $moment
     *
     * @return View
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) complex because of while loop
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
     */
    public function index(string $moment = null)
    {
@@ -184,7 +184,6 @@ class BudgetController extends Controller
                $end   = Navigation::endOfPeriod($start, $range);
            } catch (Exception $e) {
                // start and end are already defined.
-
            }
        }
        $next = clone $end;
@@ -192,17 +191,13 @@ class BudgetController extends Controller
        $prev = clone $start;
        $prev->subDay();
        $prev = Navigation::startOfPeriod($prev, $range);
-
-
        $this->repository->cleanupBudgets();
-
-
        $budgets           = $this->repository->getActiveBudgets();
        $inactive          = $this->repository->getInactiveBudgets();
        $periodStart       = $start->formatLocalized($this->monthAndDayFormat);
        $periodEnd         = $end->formatLocalized($this->monthAndDayFormat);
-        $budgetInformation = $this->collectBudgetInformation($budgets, $start, $end);
-        $defaultCurrency   = Amount::getDefaultCurrency();
+        $budgetInformation = $this->repository->collectBudgetInformation($budgets, $start, $end);
+        $defaultCurrency   = app('amount')->getDefaultCurrency();
        $available         = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
        $spent             = array_sum(array_column($budgetInformation, 'spent'));
        $budgeted          = array_sum(array_column($budgetInformation, 'budgeted'));
@@ -243,17 +238,85 @@ class BudgetController extends Controller
            compact(
                'available', 'currentMonth', 'next', 'nextText', 'prev', 'prevText',
                'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets',
-                'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start'
+                'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end'
            )
        );
    }

+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function infoIncome(Carbon $start, Carbon $end)
+    {
+        // properties for cache
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('info-income');
+
+        if ($cache->has()) {
+            $result = $cache->get(); // @codeCoverageIgnore
+        }
+        if (!$cache->has()) {
+            $result   = [
+                'available' => '0',
+                'earned'    => '0',
+                'suggested' => '0',
+            ];
+            $currency = app('amount')->getDefaultCurrency();
+            $range    = Preferences::get('viewRange', '1M')->data;
+            $begin    = Navigation::subtractPeriod($start, $range, 3);
+
+            // get average amount available.
+            $total        = '0';
+            $count        = 0;
+            $currentStart = clone $begin;
+            while ($currentStart < $start) {
+                $currentEnd   = Navigation::endOfPeriod($currentStart, $range);
+                $total        = bcadd($total, $this->repository->getAvailableBudget($currency, $currentStart, $currentEnd));
+                $currentStart = Navigation::addPeriod($currentStart, $range, 0);
+                $count++;
+            }
+            $result['available'] = bcdiv($total, strval($count));
+
+            // amount earned in this period:
+            $subDay = clone $end;
+            $subDay->subDay();
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::DEPOSIT])->withOpposingAccount();
+            $result['earned'] = bcdiv(strval($collector->getJournals()->sum('transaction_amount')), strval($count));
+
+            // amount spent in period
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::WITHDRAWAL])->withOpposingAccount();
+            $result['spent'] = bcdiv(strval($collector->getJournals()->sum('transaction_amount')), strval($count));
+            // suggestion starts with the amount spent
+            $result['suggested'] = bcmul($result['spent'], '-1');
+            $result['suggested'] = bccomp($result['suggested'], $result['earned']) === 1 ? $result['earned'] : $result['suggested'];
+            // unless it's more than you earned. So min() of suggested/earned
+
+
+            $cache->store($result);
+        }
+
+
+        return view('budgets.info', compact('result', 'begin', 'currentEnd'));
+    }
+
    /**
     * @param Request                    $request
     * @param JournalRepositoryInterface $repository
     * @param string                     $moment
     *
     * @return View
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
     */
    public function noBudget(Request $request, JournalRepositoryInterface $repository, string $moment = '')
    {
@@ -293,37 +356,15 @@ class BudgetController extends Controller
            );
        }

-        $page     = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $page     = intval($request->get('page'));
        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);

-        $count = 0;
-        $loop  = 0;
-        // grab journals, but be prepared to jump a period back to get the right ones:
-        Log::info('Now at no-budget loop start.');
-        while ($count === 0 && $loop < 3) {
-            $loop++;
-            Log::info(sprintf('Count is zero, search for journals between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class);
-            $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
-                      ->withoutBudget()->withOpposingAccount();
-            $journals = $collector->getPaginatedJournals();
-            $journals->setPath('/budgets/list/no-budget');
-            $count = $journals->getCollection()->count();
-            if ($count === 0 && $loop < 3) {
-                $start->subDay();
-                $start = Navigation::startOfPeriod($start, $range);
-                $end   = Navigation::endOfPeriod($start, $range);
-                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
-            }
-        }
-
-        if ($moment != 'all' && $loop > 1) {
-            $subTitle = trans(
-                'firefly.without_budget_between',
-                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
-            );
-        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
+                  ->withoutBudget()->withOpposingAccount();
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath(route('budgets.no-budget'));

        return view('budgets.no-budget', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end'));
    }
@@ -335,15 +376,15 @@ class BudgetController extends Controller
     */
    public function postUpdateIncome(BudgetIncomeRequest $request)
    {
-        $start           = session('start', new Carbon);
-        $end             = session('end', new Carbon);
-        $defaultCurrency = Amount::getDefaultCurrency();
+        $start           = Carbon::createFromFormat('Y-m-d', $request->string('start'));
+        $end             = Carbon::createFromFormat('Y-m-d', $request->string('end'));
+        $defaultCurrency = app('amount')->getDefaultCurrency();
        $amount          = $request->get('amount');

        $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount);
        Preferences::mark();

-        return redirect(route('budgets.index'));
+        return redirect(route('budgets.index', [$start->format('Y-m-d')]));
    }

    /**
@@ -357,16 +398,16 @@ class BudgetController extends Controller
        /** @var Carbon $start */
        $start      = session('first', Carbon::create()->startOfYear());
        $end        = new Carbon;
-        $page       = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $page       = intval($request->get('page'));
        $pageSize   = intval(Preferences::get('transactionPageSize', 50)->data);
        $limits     = $this->getLimits($budget, $start, $end);
        $repetition = null;
        // collector:
        /** @var JournalCollectorInterface $collector */
        $collector = app(JournalCollectorInterface::class);
-        $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation();
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation();
        $journals = $collector->getPaginatedJournals();
-        $journals->setPath('/budgets/show/' . $budget->id);
+        $journals->setPath(route('budgets.show', [$budget->id]));


        $subTitle = trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
@@ -384,11 +425,11 @@ class BudgetController extends Controller
     */
    public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit)
    {
-        if ($budgetLimit->budget->id != $budget->id) {
+        if ($budgetLimit->budget->id !== $budget->id) {
            throw new FireflyException('This budget limit is not part of this budget.');
        }

-        $page     = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $page     = intval($request->get('page'));
        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
        $subTitle = trans(
            'firefly.budget_in_period', [
@@ -402,11 +443,9 @@ class BudgetController extends Controller
        /** @var JournalCollectorInterface $collector */
        $collector = app(JournalCollectorInterface::class);
        $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date)
-                  ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation();
+                  ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation();
        $journals = $collector->getPaginatedJournals();
-        $journals->setPath('/budgets/show/' . $budget->id . '/' . $budgetLimit->id);
-
-
+        $journals->setPath(route('budgets.show', [$budget->id, $budgetLimit->id]));
        $start  = session('first', Carbon::create()->startOfYear());
        $end    = new Carbon;
        $limits = $this->getLimits($budget, $start, $end);
@@ -465,62 +504,20 @@ class BudgetController extends Controller
    }

    /**
-     * @return View
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
-    public function updateIncome()
+    public function updateIncome(Carbon $start, Carbon $end)
    {
-        $start           = session('start', new Carbon);
-        $end             = session('end', new Carbon);
-        $defaultCurrency = Amount::getDefaultCurrency();
+        $defaultCurrency = app('amount')->getDefaultCurrency();
        $available       = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
-
+        $available       = round($available, $defaultCurrency->decimal_places);

        return view('budgets.income', compact('available', 'start', 'end'));
    }

-    /**
-     * @param Collection $budgets
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    private function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array
-    {
-        // get account information
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
-        $return            = [];
-        /** @var Budget $budget */
-        foreach ($budgets as $budget) {
-            $budgetId          = $budget->id;
-            $return[$budgetId] = [
-                'spent'      => $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end),
-                'budgeted'   => '0',
-                'currentRep' => false,
-            ];
-            $budgetLimits      = $this->repository->getBudgetLimits($budget, $start, $end);
-            $otherLimits       = new Collection;
-
-            // get all the budget limits relevant between start and end and examine them:
-            /** @var BudgetLimit $limit */
-            foreach ($budgetLimits as $limit) {
-                if ($limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end)
-                ) {
-                    $return[$budgetId]['currentLimit'] = $limit;
-                    $return[$budgetId]['budgeted']     = $limit->amount;
-                    continue;
-                }
-                // otherwise it's just one of the many relevant repetitions:
-                $otherLimits->push($limit);
-            }
-            $return[$budgetId]['otherLimits'] = $otherLimits;
-        }
-
-        return $return;
-    }
-
    /**
     * @param Budget $budget
     * @param Carbon $start
@@ -541,15 +538,12 @@ class BudgetController extends Controller
            return $cache->get(); // @codeCoverageIgnore
        }

-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
-        $set               = $this->repository->getBudgetLimits($budget, $start, $end);
-        $limits            = new Collection();
+        $set    = $this->repository->getBudgetLimits($budget, $start, $end);
+        $limits = new Collection();

        /** @var BudgetLimit $entry */
        foreach ($set as $entry) {
-            $entry->spent = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $entry->start_date, $entry->end_date);
+            $entry->spent = $this->repository->spentInPeriod(new Collection([$budget]), new Collection(), $entry->start_date, $entry->end_date);
            $limits->push($entry);
        }
        $cache->store($limits);
@@ -567,7 +561,7 @@ class BudgetController extends Controller
        $start      = $first->date ?? new Carbon;
        $range      = Preferences::get('viewRange', '1M')->data;
        $start      = Navigation::startOfPeriod($start, $range);
-        $end        = Navigation::endOfX(new Carbon, $range);
+        $end        = Navigation::endOfX(new Carbon, $range, null);
        $entries    = new Collection;

        // properties for cache
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -164,10 +164,12 @@ class CategoryController extends Controller
    public function noCategory(Request $request, JournalRepositoryInterface $repository, string $moment = '')
    {
        // default values:
-        $range   = Preferences::get('viewRange', '1M')->data;
-        $start   = null;
-        $end     = null;
-        $periods = new Collection;
+        $range    = Preferences::get('viewRange', '1M')->data;
+        $start    = null;
+        $end      = null;
+        $periods  = new Collection;
+        $page     = intval($request->get('page'));
+        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);

        // prep for "all" view.
        if ($moment === 'all') {
@@ -199,37 +201,14 @@ class CategoryController extends Controller
            );
        }

-        $page     = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
-        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);

-        $count = 0;
-        $loop  = 0;
-        // grab journals, but be prepared to jump a period back to get the right ones:
-        Log::info('Now at no-cat loop start.');
-        while ($count === 0 && $loop < 3) {
-            $loop++;
-            Log::info('Count is zero, search for journals.');
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class);
-            $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount();
-            $collector->removeFilter(InternalTransferFilter::class);
-            $journals = $collector->getPaginatedJournals();
-            $journals->setPath('/categories/list/no-category');
-            $count = $journals->getCollection()->count();
-            if ($count === 0 && $loop < 3) {
-                $start->subDay();
-                $start = Navigation::startOfPeriod($start, $range);
-                $end   = Navigation::endOfPeriod($start, $range);
-                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
-            }
-        }
-
-        if ($moment != 'all' && $loop > 1) {
-            $subTitle = trans(
-                'firefly.without_category_between',
-                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
-            );
-        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount()
+                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
+        $collector->removeFilter(InternalTransferFilter::class);
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath(route('categories.no-category'));

        return view('categories.no-category', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end'));
    }
@@ -247,21 +226,20 @@ class CategoryController extends Controller
        // default values:
        $subTitle     = $category->name;
        $subTitleIcon = 'fa-bar-chart';
-        $page         = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $page         = intval($request->get('page'));
        $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
-        $count        = 0;
-        $loop         = 0;
        $range        = Preferences::get('viewRange', '1M')->data;
        $start        = null;
        $end          = null;
        $periods      = new Collection;

-
        // prep for "all" view.
        if ($moment === 'all') {
            $subTitle = trans('firefly.all_journals_for_category', ['name' => $category->name]);
-            $start    = $repository->firstUseDate($category);
-            $end      = new Carbon;
+            $first    = $repository->firstUseDate($category);
+            /** @var Carbon $start */
+            $start = is_null($first) ? new Carbon : $first;
+            $end   = new Carbon;
        }

        // prep for "specific date" view.
@@ -278,7 +256,9 @@ class CategoryController extends Controller

        // prep for current period
        if (strlen($moment) === 0) {
-            $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
+            /** @var Carbon $start */
+            $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
+            /** @var Carbon $end */
            $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
            $periods  = $this->getPeriodOverview($category);
            $subTitle = trans(
@@ -287,34 +267,15 @@ class CategoryController extends Controller
                 'end'  => $end->formatLocalized($this->monthAndDayFormat)]
            );
        }
-        // grab journals, but be prepared to jump a period back to get the right ones:
-        Log::info('Now at category loop start.');
-        while ($count === 0 && $loop < 3) {
-            $loop++;
-            Log::info('Count is zero, search for journals.');
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class);
-            $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount()
-                      ->setCategory($category)->withBudgetInformation()->withCategoryInformation();
-            $collector->removeFilter(InternalTransferFilter::class);
-            $journals = $collector->getPaginatedJournals();
-            $journals->setPath('categories/show/' . $category->id);
-            $count = $journals->getCollection()->count();
-            if ($count === 0 && $loop < 3) {
-                $start->subDay();
-                $start = Navigation::startOfPeriod($start, $range);
-                $end   = Navigation::endOfPeriod($start, $range);
-                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
-            }
-        }

-        if ($moment != 'all' && $loop > 1) {
-            $subTitle = trans(
-                'firefly.journals_in_period_for_category',
-                ['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-                 'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-            );
-        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount()
+                  ->setCategory($category)->withBudgetInformation()->withCategoryInformation();
+        $collector->removeFilter(InternalTransferFilter::class);
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath(route('categories.show', [$category->id]));
+

        return view('categories.show', compact('category', 'moment', 'journals', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
    }
@@ -382,7 +343,7 @@ class CategoryController extends Controller
        $start      = $first->date ?? new Carbon;
        $range      = Preferences::get('viewRange', '1M')->data;
        $start      = Navigation::startOfPeriod($start, $range);
-        $end        = Navigation::endOfX(new Carbon, $range);
+        $end        = Navigation::endOfX(new Carbon, $range, null);
        $entries    = new Collection;

        // properties for cache
@@ -401,11 +362,11 @@ class CategoryController extends Controller
            $end        = Navigation::startOfPeriod($end, $range);
            $currentEnd = Navigation::endOfPeriod($end, $range);

-            // count journals without budget in this period:
+            // count journals without category in this period:
            /** @var JournalCollectorInterface $collector */
            $collector = app(JournalCollectorInterface::class);
            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()
-                      ->withOpposingAccount();
+                      ->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
            $collector->removeFilter(InternalTransferFilter::class);
            $count = $collector->getJournals()->count();

@@ -463,13 +424,14 @@ class CategoryController extends Controller
        $accountRepository = app(AccountRepositoryInterface::class);
        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
        $first             = $repository->firstUseDate($category);
-        if ($first->year == 1900) {
+        if (is_null($first)) {
            $first = new Carbon;
        }
        $range   = Preferences::get('viewRange', '1M')->data;
        $first   = Navigation::startOfPeriod($first, $range);
-        $end     = Navigation::endOfX(new Carbon, $range);
+        $end     = Navigation::endOfX(new Carbon, $range, null);
        $entries = new Collection;
+        $count   = 0;

        // properties for entries with their amounts.
        $cache = new CacheProperties();
@@ -481,7 +443,7 @@ class CategoryController extends Controller
        if ($cache->has()) {
            return $cache->get(); // @codeCoverageIgnore
        }
-        while ($end >= $first) {
+        while ($end >= $first && $count < 90) {
            $end        = Navigation::startOfPeriod($end, $range);
            $currentEnd = Navigation::endOfPeriod($end, $range);
            $spent      = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
@@ -509,6 +471,7 @@ class CategoryController extends Controller
                ]
            );
            $end = Navigation::subtractPeriod($end, $range, 1);
+            $count++;
        }
        $cache->store($entries);

--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -124,7 +124,7 @@ class BudgetController extends Controller
     */
    public function budgetLimit(Budget $budget, BudgetLimit $budgetLimit)
    {
-        if ($budgetLimit->budget->id != $budget->id) {
+        if ($budgetLimit->budget->id !== $budget->id) {
            throw new FireflyException('This budget limit is not part of this budget.');
        }

@@ -163,7 +163,7 @@ class BudgetController extends Controller
     *
     * @return \Illuminate\Http\JsonResponse
     */
-    public function expenseAsset(Budget $budget, BudgetLimit $budgetLimit = null)
+    public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit)
    {
        $cache = new CacheProperties;
        $cache->addProperty($budget->id);
@@ -175,7 +175,7 @@ class BudgetController extends Controller

        /** @var JournalCollectorInterface $collector */
        $collector = app(JournalCollectorInterface::class);
-        $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget);
+        $collector->setAllAssetAccounts()->setBudget($budget);
        if (!is_null($budgetLimit->id)) {
            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
        }
@@ -208,7 +208,7 @@ class BudgetController extends Controller
     *
     * @return \Illuminate\Http\JsonResponse
     */
-    public function expenseCategory(Budget $budget, BudgetLimit $budgetLimit = null)
+    public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit)
    {
        $cache = new CacheProperties;
        $cache->addProperty($budget->id);
@@ -220,7 +220,7 @@ class BudgetController extends Controller

        /** @var JournalCollectorInterface $collector */
        $collector = app(JournalCollectorInterface::class);
-        $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget)->withCategoryInformation();
+        $collector->setAllAssetAccounts()->setBudget($budget)->withCategoryInformation();
        if (!is_null($budgetLimit->id)) {
            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
        }
@@ -244,7 +244,6 @@ class BudgetController extends Controller

        $data = $this->generator->pieChart($chartData);
        $cache->store($data);
-
        return Response::json($data);

    }
@@ -255,7 +254,7 @@ class BudgetController extends Controller
     *
     * @return \Illuminate\Http\JsonResponse
     */
-    public function expenseExpense(Budget $budget, BudgetLimit $budgetLimit = null)
+    public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit)
    {
        $cache = new CacheProperties;
        $cache->addProperty($budget->id);
@@ -439,7 +438,7 @@ class BudgetController extends Controller
    {
        /** @var AccountRepositoryInterface $repository */
        $repository = app(AccountRepositoryInterface::class);
-        $accounts   = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::EXPENSE]);
+        $accounts   = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::CASH]);
        $grouped    = $accounts->groupBy('id')->toArray();
        $return     = [];
        foreach ($accountIds as $accountId) {
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -67,7 +67,7 @@ class CategoryController extends Controller

        $start = $repository->firstUseDate($category);

-        if ($start->year == 1900) {
+        if (is_null($start)) {
            $start = new Carbon;
        }

--- a/app/Http/Controllers/Chart/CategoryReportController.php
+++ b/app/Http/Controllers/Chart/CategoryReportController.php
@@ -247,7 +247,7 @@ class CategoryReportController extends Controller
        // remove all empty entries to prevent cluttering:
        $newSet = [];
        foreach ($chartData as $key => $entry) {
-            if (!array_sum($entry['entries']) == 0) {
+            if (!array_sum($entry['entries']) === 0) {
                $newSet[$key] = $chartData[$key];
            }
        }
--- a/app/Http/Controllers/Chart/TagReportController.php
+++ b/app/Http/Controllers/Chart/TagReportController.php
@@ -231,7 +231,7 @@ class TagReportController extends Controller
        // remove all empty entries to prevent cluttering:
        $newSet = [];
        foreach ($chartData as $key => $entry) {
-            if (!array_sum($entry['entries']) == 0) {
+            if (!array_sum($entry['entries']) === 0) {
                $newSet[$key] = $chartData[$key];
            }
        }
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -18,10 +18,13 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use Log;
+use Route;
 use Session;
 use URL;
 use View;
@@ -41,28 +44,59 @@ class Controller extends BaseController
    protected $monthAndDayFormat;
    /** @var string */
    protected $monthFormat;
+    /** @var string */
+    protected $redirectUri = '/';

    /**
     * Controller constructor.
     */
    public function __construct()
    {
+        // for transaction lists:
        View::share('hideBudgets', false);
        View::share('hideCategories', false);
        View::share('hideBills', false);
        View::share('hideTags', false);
+
+        // is site a demo site?
        $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
        View::share('IS_DEMO_SITE', $isDemoSite);
        View::share('DEMO_USERNAME', env('DEMO_USERNAME', ''));
        View::share('DEMO_PASSWORD', env('DEMO_PASSWORD', ''));
+        View::share('FF_VERSION', config('firefly.version'));
+

-        // translations:
        $this->middleware(
            function ($request, $next) {
+                // translations for specific strings:
                $this->monthFormat       = (string)trans('config.month');
                $this->monthAndDayFormat = (string)trans('config.month_and_day');
                $this->dateTimeFormat    = (string)trans('config.date_time');

+                // get shown-intro-preference:
+                if (auth()->check()) {
+                    // some routes have a "what" parameter, which indicates a special page:
+                    $specificPage = is_null(Route::current()->parameter('what')) ? '' : '_' . Route::current()->parameter('what');
+                    $page         = str_replace('.', '_', Route::currentRouteName());
+
+                    // indicator if user has seen the help for this page ( + special page):
+                    $key = 'shown_demo_' . $page . $specificPage;
+                    // is there an intro for this route?
+                    $intro        = config('intro.' . $page);
+                    $specialIntro = config('intro.' . $page . $specificPage);
+                    $shownDemo    = true;
+
+                    // either must be array and either must be > 0
+                    if ((is_array($intro) || is_array($specialIntro)) && (count($intro) > 0 || count($specialIntro) > 0)) {
+                        $shownDemo = Preferences::get($key, false)->data;
+                        Log::debug(sprintf('Check if user has already seen intro with key "%s". Result is %d', $key, $shownDemo));
+                    }
+
+                    View::share('shownDemo', $shownDemo);
+                    View::share('current_route_name', $page);
+                    View::share('original_route_name', Route::currentRouteName());
+                }
+
                return $next($request);
            }
        );
@@ -84,10 +118,10 @@ class Controller extends BaseController
    {
        $uri = strval(session($identifier));
        if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) {
-            $uri = route('index');
+            $uri = $this->redirectUri;
        }
-        if (!(strpos($uri, 'javascript') === false)) {
-            $uri = route('index');
+        if (!(strpos($uri, 'jscript') === false)) {
+            $uri = $this->redirectUri;
        }

        return $uri;
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -46,7 +46,7 @@ class ExportController extends Controller
        $this->middleware(
            function ($request, $next) {
                View::share('mainTitleIcon', 'fa-file-archive-o');
-                View::share('title', trans('firefly.export_data'));
+                View::share('title', trans('firefly.export_and_backup_data'));

                return $next($request);
            }
@@ -137,13 +137,14 @@ class ExportController extends Controller
    public function postIndex(ExportFormRequest $request, AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs)
    {
        $job      = $jobs->findByKey($request->get('job'));
+        $accounts = $request->get('accounts') ?? [];
        $settings = [
-            'accounts'           => $repository->getAccountsById($request->get('accounts')),
+            'accounts'           => $repository->getAccountsById($accounts),
            'startDate'          => new Carbon($request->get('export_start_range')),
            'endDate'            => new Carbon($request->get('export_end_range')),
            'exportFormat'       => $request->get('exportFormat'),
-            'includeAttachments' => intval($request->get('include_attachments')) === 1,
-            'includeOldUploads'  => intval($request->get('include_old_uploads')) === 1,
+            'includeAttachments' => $request->boolean('include_attachments'),
+            'includeOldUploads'  => $request->boolean('include_old_uploads'),
            'job'                => $job,
        ];

@@ -159,12 +160,14 @@ class ExportController extends Controller
        $jobs->changeStatus($job, 'export_status_collecting_journals');
        $processor->collectJournals();
        $jobs->changeStatus($job, 'export_status_collected_journals');
+
        /*
         * Transform to exportable entries:
         */
        $jobs->changeStatus($job, 'export_status_converting_to_export_format');
        $processor->convertJournals();
        $jobs->changeStatus($job, 'export_status_converted_to_export_format');
+
        /*
         * Transform to (temporary) file:
         */
@@ -180,6 +183,7 @@ class ExportController extends Controller
            $jobs->changeStatus($job, 'export_status_collected_attachments');
        }

+
        /*
         * Collect old uploads
         */
--- a/app/Http/Controllers/HelpController.php
+++ b/app/Http/Controllers/HelpController.php
@@ -25,62 +25,95 @@ use Response;
 */
 class HelpController extends Controller
 {
+
+    /** @var HelpInterface */
+    private $help;
+
    /**
     * HelpController constructor.
     */
    public function __construct()
    {
        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                $this->help = app(HelpInterface::class);
+
+                return $next($request);
+            }
+        );
    }

    /**
-     * @param HelpInterface $help
     * @param               $route
     *
     * @return \Illuminate\Http\JsonResponse
     */
-    public function show(HelpInterface $help, string $route)
+    public function show(string $route)
    {
-
        $language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
-        $content  = '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
+        $html     = $this->getHelpText($route, $language);

-        if (!$help->hasRoute($route)) {
+        return Response::json(['html' => $html]);
+
+    }
+
+    /**
+     * @param string $route
+     * @param string $language
+     *
+     * @return string
+     */
+    private function getHelpText(string $route, string $language): string
+    {
+        // get language and default variables.
+
+        $content = '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
+
+        // if no such route, log error and return default text.
+        if (!$this->help->hasRoute($route)) {
            Log::error('No such route: ' . $route);

-            return Response::json($content);
+            return $content;
        }

-        if ($help->inCache($route, $language)) {
-            $content = $help->getFromCache($route, $language);
+        // help content may be cached:
+        if ($this->help->inCache($route, $language)) {
+            $content = $this->help->getFromCache($route, $language);
            Log::debug(sprintf('Help text %s was in cache.', $language));

-            return Response::json($content);
+            return $content;
        }

-        $content         = $help->getFromGithub($route, $language);
-        $notYourLanguage = '<p><em>' . strval(trans('firefly.help_may_not_be_your_language')) . '</em></p>';
+        // get help content from Github:
+        $content = $this->help->getFromGithub($route, $language);

-        // get backup language content (try English):
+        // content will have 0 length when Github failed. Try en_US when it does:
        if (strlen($content) === 0) {
            $language = 'en_US';
-            if ($help->inCache($route, $language)) {
+
+            // also check cache first:
+            if ($this->help->inCache($route, $language)) {
                Log::debug(sprintf('Help text %s was in cache.', $language));
-                $content = $notYourLanguage . $help->getFromCache($route, $language);
-            }
-            if (!$help->inCache($route, $language)) {
-                $content = trim($notYourLanguage . $help->getFromGithub($route, $language));
+                $content = $this->help->getFromCache($route, $language);
+
+                return $content;
            }
+
+            $content = $this->help->getFromGithub($route, $language);
+
        }

-        if ($content === $notYourLanguage) {
-            $content = '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
+        // help still empty?
+        if (strlen($content) !== 0) {
+            $this->help->putInCache($route, $language, $content);
+
+            return $content;
+
        }

-        $help->putInCache($route, $language, $content);
-
-        return Response::json($content);
-
+        return '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
    }


--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -21,9 +21,11 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
 use Illuminate\Support\Collection;
 use Log;
 use Preferences;
+use Route as RouteFacade;
 use Session;
 use View;

@@ -80,6 +82,14 @@ class HomeController extends Controller
     */
    public function displayError()
    {
+        Log::debug('This is a test message at the DEBUG level.');
+        Log::info('This is a test message at the INFO level.');
+        Log::notice('This is a test message at the NOTICE level.');
+        Log::warning('This is a test message at the WARNING level.');
+        Log::error('This is a test message at the ERROR level.');
+        Log::critical('This is a test message at the CRITICAL level.');
+        Log::alert('This is a test message at the ALERT level.');
+        Log::emergency('This is a test message at the EMERGENCY level.');
        throw new FireflyException('A very simple test error.');
    }

@@ -107,7 +117,7 @@ class HomeController extends Controller
        $types = config('firefly.accountTypesByIdentifier.asset');
        $count = $repository->count($types);

-        if ($count == 0) {
+        if ($count === 0) {
            return redirect(route('new-user.index'));
        }

@@ -119,10 +129,9 @@ class HomeController extends Controller
        /** @var Carbon $start */
        $start = session('start', Carbon::now()->startOfMonth());
        /** @var Carbon $end */
-        $end                   = session('end', Carbon::now()->endOfMonth());
-        $showTour              = Preferences::get('tour', true)->data;
-        $accounts              = $repository->getAccountsById($frontPage->data);
-        $showDepositsFrontpage = Preferences::get('showDepositsFrontpage', false)->data;
+        $end      = session('end', Carbon::now()->endOfMonth());
+        $accounts = $repository->getAccountsById($frontPage->data);
+        $showDeps = Preferences::get('showDepositsFrontpage', false)->data;

        // zero bills? Hide some elements from view.
        /** @var BillRepositoryInterface $billRepository */
@@ -137,10 +146,42 @@ class HomeController extends Controller
        }

        return view(
-            'index', compact('count', 'showTour', 'title', 'subTitle', 'mainTitleIcon', 'transactions', 'showDepositsFrontpage', 'billCount')
+            'index', compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount')
        );
    }

+    public function routes()
+    {
+        $set    = RouteFacade::getRoutes();
+        $ignore = ['chart.', 'javascript.', 'json.', 'report-data.', 'popup.', 'debugbar.', 'attachments.download', 'attachments.preview',
+                   'bills.rescan', 'budgets.income', 'currencies.def', 'error', 'flush', 'help.show', 'import.file',
+                   'login', 'logout', 'password.reset', 'profile.confirm-email-change', 'profile.undo-email-change',
+                   'register', 'report.options', 'routes', 'rule-groups.down', 'rule-groups.up', 'rules.up', 'rules.down',
+                   'rules.select', 'search.search', 'test-flash', 'transactions.link.delete', 'transactions.link.switch',
+                   'two-factor.lost', 'report.options',
+
+        ];
+
+        /** @var Route $route */
+        foreach ($set as $route) {
+            $name = $route->getName();
+            if (!is_null($name) && in_array('GET', $route->methods()) && strlen($name) > 0) {
+                $found = false;
+                foreach ($ignore as $string) {
+                    if (strpos($name, $string) !== false) {
+                        $found = true;
+                    }
+                }
+                if (!$found) {
+                    echo 'touch ' . $route->getName() . '.md;';
+                }
+
+            }
+        }
+
+        return '&nbsp;';
+    }
+
    /**
     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * BankController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Import;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Support\Import\Information\InformationInterface;
+use FireflyIII\Support\Import\Prerequisites\PrerequisitesInterface;
+use Illuminate\Http\Request;
+use Log;
+use Session;
+
+class BankController extends Controller
+{
+
+    /**
+     * This method must ask the user all parameters necessary to start importing data. This may not be enough
+     * to finish the import itself (ie. mapping) but it should be enough to begin: accounts to import from,
+     * accounts to import into, data ranges, etc.
+     *
+     * @param string $bank
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+     */
+    public function form(string $bank)
+    {
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+        /** @var PrerequisitesInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+
+        if ($object->hasPrerequisites()) {
+            return redirect(route('import.bank.prerequisites', [$bank]));
+        }
+        $class = config(sprintf('firefly.import_info.%s', $bank));
+        /** @var InformationInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+        $remoteAccounts = $object->getAccounts();
+
+        return view('import.bank.form', compact('remoteAccounts', 'bank'));
+
+    }
+
+    /**
+     * With the information given in the submitted form Firefly III will call upon the bank's classes to return transaction
+     * information as requested. The user will be able to map unknown data and continue. Or maybe, it's put into some kind of
+     * fake CSV file and forwarded to the import routine.
+     *
+     * @param Request $request
+     * @param string  $bank
+     *
+     * @return \Illuminate\Http\RedirectResponse|null
+     */
+    public function postForm(Request $request, string $bank)
+    {
+
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+        /** @var PrerequisitesInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+
+        if ($object->hasPrerequisites()) {
+            return redirect(route('import.bank.prerequisites', [$bank]));
+        }
+        $remoteAccounts = $request->get('do_import');
+        if (!is_array($remoteAccounts) || count($remoteAccounts) === 0) {
+            Session::flash('error', 'Must select accounts');
+
+            return redirect(route('import.bank.form', [$bank]));
+        }
+        $remoteAccounts = array_keys($remoteAccounts);
+        $class          = config(sprintf('firefly.import_pre.%s', $bank));
+        // get import file
+
+        // get import config
+
+
+    }
+
+    /**
+     * This method processes the prerequisites the user has entered in the previous step.
+     *
+     * Whatever storePrerequisites does, it should make sure that the system is ready to continue immediately. So
+     * no extra calls or stuff, except maybe to open a session
+     *
+     * @see PrerequisitesInterface::storePrerequisites
+     *
+     * @param Request $request
+     * @param string  $bank
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function postPrerequisites(Request $request, string $bank)
+    {
+        Log::debug(sprintf('Now in postPrerequisites for %s', $bank));
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+        /** @var PrerequisitesInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+        if (!$object->hasPrerequisites()) {
+            Log::debug(sprintf('No more prerequisites for %s, move to form.', $bank));
+
+            return redirect(route('import.bank.form', [$bank]));
+        }
+        Log::debug('Going to store entered preprerequisites.');
+        // store post data
+        $result = $object->storePrerequisites($request);
+
+        if ($result->count() > 0) {
+            Session::flash('error', $result->first());
+
+            return redirect(route('import.bank.prerequisites', [$bank]));
+        }
+
+        return redirect(route('import.bank.form', [$bank]));
+    }
+
+    /**
+     * This method shows you, if necessary, a form that allows you to enter any required values, such as API keys,
+     * login passwords or other values.
+     *
+     * @param string $bank
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+     */
+    public function prerequisites(string $bank)
+    {
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+        /** @var PrerequisitesInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+
+        if ($object->hasPrerequisites()) {
+            $view       = $object->getView();
+            $parameters = $object->getViewParameters();
+
+            return view($view, $parameters);
+        }
+
+        return redirect(route('import.bank.form', [$bank]));
+    }
+
+}
--- a/app/Http/Controllers/Import/FileController.php
+++ b/app/Http/Controllers/Import/FileController.php
@@ -0,0 +1,306 @@
+<?php
+/**
+ * FileController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+
+namespace FireflyIII\Http\Controllers\Import;
+
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\ImportUploadRequest;
+use FireflyIII\Import\Configurator\ConfiguratorInterface;
+use FireflyIII\Import\Routine\ImportRoutine;
+use FireflyIII\Models\ImportJob;
+use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response as LaravelResponse;
+use Log;
+use Response;
+use Session;
+use View;
+
+
+/**
+ * Class FileController.
+ *
+ * @package FireflyIII\Http\Controllers\Import
+ */
+class FileController extends Controller
+{
+    /** @var  ImportJobRepositoryInterface */
+    public $repository;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                View::share('mainTitleIcon', 'fa-archive');
+                View::share('title', trans('firefly.import_index_title'));
+                $this->repository = app(ImportJobRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * This is step 3. This repeats until the job is configured.
+     *
+     * @param ImportJob $job
+     *
+     * @return View
+     * @throws FireflyException
+     */
+    public function configure(ImportJob $job)
+    {
+        // create configuration class:
+        $configurator = $this->makeConfigurator($job);
+
+        // is the job already configured?
+        if ($configurator->isJobConfigured()) {
+            $this->repository->updateStatus($job, 'configured');
+
+            return redirect(route('import.file.status', [$job->key]));
+        }
+        $view         = $configurator->getNextView();
+        $data         = $configurator->getNextData();
+        $subTitle     = trans('firefly.import_config_bread_crumb');
+        $subTitleIcon = 'fa-wrench';
+
+        return view($view, compact('data', 'job', 'subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * Generate a JSON file of the job's configuration and send it to the user.
+     *
+     * @param ImportJob $job
+     *
+     * @return LaravelResponse
+     */
+    public function download(ImportJob $job)
+    {
+        Log::debug('Now in download()', ['job' => $job->key]);
+        $config = $job->configuration;
+
+        // This is CSV import specific:
+        $config['column-roles-complete']   = false;
+        $config['column-mapping-complete'] = false;
+        $config['initial-config-complete'] = false;
+        $config['delimiter']               = $config['delimiter'] === "\t" ? 'tab' : $config['delimiter'];
+
+        $result = json_encode($config, JSON_PRETTY_PRINT);
+        $name   = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\'));
+
+        /** @var LaravelResponse $response */
+        $response = response($result, 200);
+        $response->header('Content-disposition', 'attachment; filename=' . $name)
+                 ->header('Content-Type', 'application/json')
+                 ->header('Content-Description', 'File Transfer')
+                 ->header('Connection', 'Keep-Alive')
+                 ->header('Expires', '0')
+                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+                 ->header('Pragma', 'public')
+                 ->header('Content-Length', strlen($result));
+
+        return $response;
+
+
+    }
+
+    /**
+     * This is step 1. Upload a file.
+     *
+     * @return View
+     */
+    public function index()
+    {
+        $subTitle          = trans('firefly.import_index_sub_title');
+        $subTitleIcon      = 'fa-home';
+        $importFileTypes   = [];
+        $defaultImportType = config('firefly.default_import_format');
+
+        foreach (array_keys(config('firefly.import_formats')) as $type) {
+            $importFileTypes[$type] = trans('firefly.import_file_type_' . $type);
+        }
+
+        return view('import.file.index', compact('subTitle', 'subTitleIcon', 'importFileTypes', 'defaultImportType'));
+    }
+
+    /**
+     * This is step 2. It creates an Import Job. Stores the import.
+     *
+     * @param ImportUploadRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function initialize(ImportUploadRequest $request)
+    {
+        Log::debug('Now in initialize()');
+
+        // create import job:
+        $type = $request->get('import_file_type');
+        $job  = $this->repository->create($type);
+        Log::debug('Created new job', ['key' => $job->key, 'id' => $job->id]);
+
+        // process file:
+        $this->repository->processFile($job, $request->files->get('import_file'));
+
+        // process config, if present:
+        if ($request->files->has('configuration_file')) {
+            $this->repository->processConfiguration($job, $request->files->get('configuration_file'));
+        }
+
+        $this->repository->updateStatus($job, 'initialized');
+
+        return redirect(route('import.file.configure', [$job->key]));
+    }
+
+
+    /**
+     *
+     * Show status of import job in JSON.
+     *
+     * @param ImportJob $job
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function json(ImportJob $job)
+    {
+        $result = [
+            'started'         => false,
+            'finished'        => false,
+            'running'         => false,
+            'errors'          => array_values($job->extended_status['errors']),
+            'percentage'      => 0,
+            'show_percentage' => false,
+            'steps'           => $job->extended_status['steps'],
+            'done'            => $job->extended_status['done'],
+            'statusText'      => trans('firefly.import_status_job_' . $job->status),
+            'status'          => $job->status,
+            'finishedText'    => '',
+        ];
+
+        if ($job->extended_status['steps'] !== 0) {
+            $result['percentage']      = round(($job->extended_status['done'] / $job->extended_status['steps']) * 100, 0);
+            $result['show_percentage'] = true;
+        }
+
+        if ($job->status === 'finished') {
+            $tagId = $job->extended_status['tag'];
+            /** @var TagRepositoryInterface $repository */
+            $repository             = app(TagRepositoryInterface::class);
+            $tag                    = $repository->find($tagId);
+            $result['finished']     = true;
+            $result['finishedText'] = trans('firefly.import_status_finished_job', ['link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]);
+        }
+
+        if ($job->status === 'running') {
+            $result['started'] = true;
+            $result['running'] = true;
+        }
+
+        return Response::json($result);
+    }
+
+    /**
+     * Step 4. Save the configuration.
+     *
+     * @param Request   $request
+     * @param ImportJob $job
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function postConfigure(Request $request, ImportJob $job)
+    {
+        Log::debug('Now in postConfigure()', ['job' => $job->key]);
+        $configurator = $this->makeConfigurator($job);
+
+        // is the job already configured?
+        if ($configurator->isJobConfigured()) {
+            return redirect(route('import.file.status', [$job->key]));
+        }
+        $data = $request->all();
+        $configurator->configureJob($data);
+
+        // get possible warning from configurator:
+        $warning = $configurator->getWarningMessage();
+
+        if (strlen($warning) > 0) {
+            Session::flash('warning', $warning);
+        }
+
+        // return to configure
+        return redirect(route('import.file.configure', [$job->key]));
+    }
+
+    /**
+     * @param ImportJob $job
+     *
+     * @return \Illuminate\Http\JsonResponse
+     * @throws FireflyException
+     */
+    public function start(ImportJob $job)
+    {
+        /** @var ImportRoutine $routine */
+        $routine = app(ImportRoutine::class);
+        $routine->setJob($job);
+        $result = $routine->run();
+        if ($result) {
+            return Response::json(['run' => 'ok']);
+        }
+
+        throw new FireflyException('Job did not complete succesfully.');
+    }
+
+    /**
+     * @param ImportJob $job
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
+     */
+    public function status(ImportJob $job)
+    {
+        $statuses = ['configured', 'running', 'finished'];
+        if (!in_array($job->status, $statuses)) {
+            return redirect(route('import.file.configure', [$job->key]));
+        }
+        $subTitle     = trans('firefly.import_status_sub_title');
+        $subTitleIcon = 'fa-star';
+
+        return view('import.file.status', compact('job', 'subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param ImportJob $job
+     *
+     * @return ConfiguratorInterface
+     * @throws FireflyException
+     */
+    private function makeConfigurator(ImportJob $job): ConfiguratorInterface
+    {
+        $type      = $job->file_type;
+        $key       = sprintf('firefly.import_configurators.%s', $type);
+        $className = config($key);
+        if (is_null($className)) {
+            throw new FireflyException('Cannot find configurator class for this job.'); // @codeCoverageIgnore
+        }
+        /** @var ConfiguratorInterface $configurator */
+        $configurator = app($className);
+        $configurator->setJob($job);
+
+
+        return $configurator;
+    }
+}
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -12,17 +12,7 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Http\Requests\ImportUploadRequest;
-use FireflyIII\Import\Configurator\ConfiguratorInterface;
-use FireflyIII\Import\Routine\ImportRoutine;
-use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
-use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response as LaravelResponse;
-use Log;
-use Response;
 use View;

 /**
@@ -53,72 +43,9 @@ class ImportController extends Controller
        );
    }

-    /**
-     * This is step 3. This repeats until the job is configured.
-     *
-     * @param ImportJob $job
-     *
-     * @return View
-     * @throws FireflyException
-     */
-    public function configure(ImportJob $job)
-    {
-        // create configuration class:
-        $configurator = $this->makeConfigurator($job);
-
-        // is the job already configured?
-        if ($configurator->isJobConfigured()) {
-            $this->repository->updateStatus($job, 'configured');
-
-            return redirect(route('import.status', [$job->key]));
-        }
-        $view         = $configurator->getNextView();
-        $data         = $configurator->getNextData();
-        $subTitle     = trans('firefly.import_config_bread_crumb');
-        $subTitleIcon = 'fa-wrench';
-
-        return view($view, compact('data', 'job', 'subTitle', 'subTitleIcon'));
-    }

    /**
-     * Generate a JSON file of the job's configuration and send it to the user.
-     *
-     * @param ImportJob $job
-     *
-     * @return LaravelResponse
-     */
-    public function download(ImportJob $job)
-    {
-        Log::debug('Now in download()', ['job' => $job->key]);
-        $config = $job->configuration;
-
-        // TODO this is CSV import specific:
-        $config['column-roles-complete']   = false;
-        $config['column-mapping-complete'] = false;
-        $config['initial-config-complete'] = false;
-        $config['delimiter']               = $config['delimiter'] === "\t" ? 'tab' : $config['delimiter'];
-
-        $result = json_encode($config, JSON_PRETTY_PRINT);
-        $name   = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\'));
-
-        /** @var LaravelResponse $response */
-        $response = response($result, 200);
-        $response->header('Content-disposition', 'attachment; filename=' . $name)
-                 ->header('Content-Type', 'application/json')
-                 ->header('Content-Description', 'File Transfer')
-                 ->header('Connection', 'Keep-Alive')
-                 ->header('Expires', '0')
-                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
-                 ->header('Pragma', 'public')
-                 ->header('Content-Length', strlen($result));
-
-        return $response;
-
-
-    }
-
-    /**
-     * This is step 1. Upload a file.
+     * General import index
     *
     * @return View
     */
@@ -136,160 +63,4 @@ class ImportController extends Controller
        return view('import.index', compact('subTitle', 'subTitleIcon', 'importFileTypes', 'defaultImportType'));
    }

-    /**
-     * This is step 2. It creates an Import Job. Stores the import.
-     *
-     * @param ImportUploadRequest $request
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function initialize(ImportUploadRequest $request)
-    {
-        Log::debug('Now in initialize()');
-
-        // create import job:
-        $type = $request->get('import_file_type');
-        $job  = $this->repository->create($type);
-        Log::debug('Created new job', ['key' => $job->key, 'id' => $job->id]);
-
-        // process file:
-        $this->repository->processFile($job, $request->files->get('import_file'));
-
-        // process config, if present:
-        if ($request->files->has('configuration_file')) {
-            $this->repository->processConfiguration($job, $request->files->get('configuration_file'));
-        }
-
-        $this->repository->updateStatus($job, 'initialized');
-
-        return redirect(route('import.configure', [$job->key]));
-    }
-
-    /**
-     *
-     * Show status of import job in JSON.
-     *
-     * @param ImportJob $job
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function json(ImportJob $job)
-    {
-        $result = [
-            'started'         => false,
-            'finished'        => false,
-            'running'         => false,
-            'errors'          => array_values($job->extended_status['errors']),
-            'percentage'      => 0,
-            'show_percentage' => false,
-            'steps'           => $job->extended_status['steps'],
-            'done'            => $job->extended_status['done'],
-            'statusText'      => trans('firefly.import_status_job_' . $job->status),
-            'status'          => $job->status,
-            'finishedText'    => '',
-        ];
-
-        if ($job->extended_status['steps'] !== 0) {
-            $result['percentage']      = round(($job->extended_status['done'] / $job->extended_status['steps']) * 100, 0);
-            $result['show_percentage'] = true;
-        }
-
-        if ($job->status === 'finished') {
-            $tagId = $job->extended_status['tag'];
-            /** @var TagRepositoryInterface $repository */
-            $repository             = app(TagRepositoryInterface::class);
-            $tag                    = $repository->find($tagId);
-            $result['finished']     = true;
-            $result['finishedText'] = trans('firefly.import_status_finished_job', ['link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]);
-        }
-
-        if ($job->status === 'running') {
-            $result['started'] = true;
-            $result['running'] = true;
-        }
-
-        return Response::json($result);
-    }
-
-    /**
-     * Step 4. Save the configuration.
-     *
-     * @param Request   $request
-     * @param ImportJob $job
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function postConfigure(Request $request, ImportJob $job)
-    {
-        Log::debug('Now in postConfigure()', ['job' => $job->key]);
-        $configurator = $this->makeConfigurator($job);
-
-        // is the job already configured?
-        if ($configurator->isJobConfigured()) {
-            return redirect(route('import.status', [$job->key]));
-        }
-        $data = $request->all();
-        $configurator->configureJob($data);
-
-        // return to configure
-        return redirect(route('import.configure', [$job->key]));
-    }
-
-    /**
-     * @param ImportJob $job
-     *
-     * @return \Illuminate\Http\JsonResponse
-     * @throws FireflyException
-     */
-    public function start(ImportJob $job)
-    {
-        /** @var ImportRoutine $routine */
-        $routine = app(ImportRoutine::class);
-        $routine->setJob($job);
-        $result = $routine->run();
-        if ($result) {
-            return Response::json(['run' => 'ok']);
-        }
-
-        throw new FireflyException('Job did not complete succesfully.');
-    }
-
-    /**
-     * @param ImportJob $job
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
-     */
-    public function status(ImportJob $job)
-    {
-        $statuses = ['configured', 'running', 'finished'];
-        if (!in_array($job->status, $statuses)) {
-            return redirect(route('import.configure', [$job->key]));
-        }
-        $subTitle     = trans('firefly.import_status_sub_title');
-        $subTitleIcon = 'fa-star';
-
-        return view('import.status', compact('job', 'subTitle', 'subTitleIcon'));
-    }
-
-    /**
-     * @param ImportJob $job
-     *
-     * @return ConfiguratorInterface
-     * @throws FireflyException
-     */
-    private function makeConfigurator(ImportJob $job): ConfiguratorInterface
-    {
-        $type      = $job->file_type;
-        $key       = sprintf('firefly.import_configurators.%s', $type);
-        $className = config($key);
-        if (is_null($className)) {
-            throw new FireflyException('Cannot find configurator class for this job.'); // @codeCoverageIgnore
-        }
-        /** @var ConfiguratorInterface $configurator */
-        $configurator = app($className);
-        $configurator->setJob($job);
-
-
-        return $configurator;
-    }
 }
--- a/app/Http/Controllers/JavascriptController.php
+++ b/app/Http/Controllers/JavascriptController.php
@@ -11,7 +11,7 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Amount;
+use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
@@ -19,9 +19,9 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Http\Request;
+use Log;
 use Navigation;
 use Preferences;
-use Session;

 /**
 * Class JavascriptController
@@ -88,27 +88,23 @@ class JavascriptController extends Controller
     */
    public function variables(Request $request)
    {
-        $picker                    = $this->getDateRangePicker();
-        $start                     = Session::get('start');
-        $end                       = Session::get('end');
-        $linkTitle                 = sprintf('%s - %s', $start->formatLocalized($this->monthAndDayFormat), $end->formatLocalized($this->monthAndDayFormat));
-        $firstDate                 = session('first')->format('Y-m-d');
        $localeconv                = localeconv();
-        $accounting                = Amount::getJsConfig($localeconv);
+        $accounting                = app('amount')->getJsConfig($localeconv);
        $localeconv                = localeconv();
-        $defaultCurrency           = Amount::getDefaultCurrency();
+        $defaultCurrency           = app('amount')->getDefaultCurrency();
        $localeconv['frac_digits'] = $defaultCurrency->decimal_places;
        $pref                      = Preferences::get('language', config('firefly.default_language', 'en_US'));
        $lang                      = $pref->data;
-        $data                      = [
-            'picker'         => $picker,
-            'linkTitle'      => $linkTitle,
-            'firstDate'      => $firstDate,
-            'currencyCode'   => Amount::getCurrencyCode(),
-            'currencySymbol' => Amount::getCurrencySymbol(),
-            'accounting'     => $accounting,
-            'localeconv'     => $localeconv,
-            'language'       => $lang,
+        $dateRange                 = $this->getDateRangeConfig();
+
+        $data = [
+            'currencyCode'    => app('amount')->getCurrencyCode(),
+            'currencySymbol'  => app('amount')->getCurrencySymbol(),
+            'accounting'      => $accounting,
+            'localeconv'      => $localeconv,
+            'language'        => $lang,
+            'dateRangeTitle'  => $dateRange['title'],
+            'dateRangeConfig' => $dateRange['configuration'],
        ];
        $request->session()->keep(['two-factor-secret']);

@@ -119,40 +115,73 @@ class JavascriptController extends Controller

    /**
     * @return array
-     * @throws FireflyException
     */
-    private function getDateRangePicker(): array
+    private function getDateRangeConfig(): array
    {
        $viewRange = Preferences::get('viewRange', '1M')->data;
-        $start     = Session::get('start');
-        $end       = Session::get('end');
+        $start     = session('start');
+        $end       = session('end');
+        $first     = session('first');
+        $title     = sprintf('%s - %s', $start->formatLocalized($this->monthAndDayFormat), $end->formatLocalized($this->monthAndDayFormat));
+        $isCustom  = session('is_custom_range');
+        $ranges    = [
+            // first range is the current range:
+            $title => [$start, $end],
+        ];
+        Log::debug(sprintf('viewRange is %s', $viewRange));

-        $prevStart = clone $start;
-        $prevEnd   = clone $start;
-        $nextStart = clone $end;
-        $nextEnd   = clone $end;
-        if ($viewRange === 'custom') {
-            $days = $start->diffInDays($end);
-            $prevStart->subDays($days);
-            $nextEnd->addDays($days);
-            unset($days);
+        // get the format for the ranges:
+        $format = $this->getFormatByRange($viewRange);
+
+        // when current range is a custom range, add the current period as the next range.
+        if ($isCustom) {
+            Log::debug('Custom is true.');
+            $index             = $start->formatLocalized($format);
+            $customPeriodStart = Navigation::startOfPeriod($start, $viewRange);
+            $customPeriodEnd   = Navigation::endOfPeriod($customPeriodStart, $viewRange);
+            $ranges[$index]    = [$customPeriodStart, $customPeriodEnd];
        }
+        // then add previous range and next range
+        $previousDate   = Navigation::subtractPeriod($start, $viewRange);
+        $index          = $previousDate->formatLocalized($format);
+        $previousStart  = Navigation::startOfPeriod($previousDate, $viewRange);
+        $previousEnd    = Navigation::endOfPeriod($previousStart, $viewRange);
+        $ranges[$index] = [$previousStart, $previousEnd];

-        if ($viewRange !== 'custom') {
-            $prevStart = Navigation::subtractPeriod($start, $viewRange);// subtract for previous period
-            $prevEnd   = Navigation::endOfPeriod($prevStart, $viewRange);
-            $nextStart = Navigation::addPeriod($start, $viewRange, 0); // add for previous period
-            $nextEnd   = Navigation::endOfPeriod($nextStart, $viewRange);
-        }
+        $nextDate       = Navigation::addPeriod($start, $viewRange, 0);
+        $index          = $nextDate->formatLocalized($format);
+        $nextStart      = Navigation::startOfPeriod($nextDate, $viewRange);
+        $nextEnd        = Navigation::endOfPeriod($nextStart, $viewRange);
+        $ranges[$index] = [$nextStart, $nextEnd];

-        $ranges             = [];
-        $ranges['current']  = [$start->format('Y-m-d'), $end->format('Y-m-d')];
-        $ranges['previous'] = [$prevStart->format('Y-m-d'), $prevEnd->format('Y-m-d')];
-        $ranges['next']     = [$nextStart->format('Y-m-d'), $nextEnd->format('Y-m-d')];
+        // everything
+        $index          = strval(trans('firefly.everything'));
+        $ranges[$index] = [$first, new Carbon];

+        $return = [
+            'title'         => $title,
+            'configuration' => [
+                'apply'       => strval(trans('firefly.apply')),
+                'cancel'      => strval(trans('firefly.cancel')),
+                'from'        => strval(trans('firefly.from')),
+                'to'          => strval(trans('firefly.to')),
+                'customRange' => strval(trans('firefly.customRange')),
+                'start'       => $start->format('Y-m-d'),
+                'end'         => $end->format('Y-m-d'),
+                'ranges'      => $ranges,
+            ],
+        ];
+
+
+        return $return;
+
+    }
+
+    private function getFormatByRange(string $viewRange): string
+    {
        switch ($viewRange) {
            default:
-                throw new FireflyException('The date picker does not yet support "' . $viewRange . '".'); // @codeCoverageIgnore
+                throw new FireflyException(sprintf('The date picker does not yet support "%s".', $viewRange)); // @codeCoverageIgnore
            case '1D':
            case 'custom':
                $format = (string)trans('config.month_and_day');
@@ -174,18 +203,6 @@ class JavascriptController extends Controller
                break;
        }

-        $current = $start->formatLocalized($format);
-        $next    = $nextStart->formatLocalized($format);
-        $prev    = $prevStart->formatLocalized($format);
-
-        return [
-            'start'    => $start->format('Y-m-d'),
-            'end'      => $end->format('Y-m-d'),
-            'current'  => $current,
-            'previous' => $prev,
-            'next'     => $next,
-            'ranges'   => $ranges,
-        ];
+        return $format;
    }
-
 }
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * AutoCompleteController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Json;
+
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
+use Response;
+
+/**
+ * Class AutoCompleteController
+ *
+ * @package FireflyIII\Http\Controllers\Json
+ */
+class AutoCompleteController extends Controller
+{
+
+    /**
+     * Returns a JSON list of all accounts.
+     *
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     */
+    public function allAccounts(AccountRepositoryInterface $repository)
+    {
+        $return = array_unique(
+            $repository->getAccountsByType(
+                [AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]
+            )->pluck('name')->toArray()
+        );
+        sort($return);
+
+        return Response::json($return);
+
+    }
+
+    /**
+     * @param JournalCollectorInterface $collector
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function allTransactionJournals(JournalCollectorInterface $collector)
+    {
+        $collector->setLimit(250)->setPage(1);
+        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * Returns a JSON list of all beneficiaries.
+     *
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     */
+    public function expenseAccounts(AccountRepositoryInterface $repository)
+    {
+        $set      = $repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY]);
+        $filtered = $set->filter(
+            function (Account $account) {
+                if ($account->active) {
+                    return $account;
+                }
+
+                return false;
+            }
+        );
+        $return   = array_unique($filtered->pluck('name')->toArray());
+
+        sort($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * @param JournalCollectorInterface $collector
+     *
+     * @param TransactionJournal        $except
+     *
+     * @return \Illuminate\Http\JsonResponse|mixed
+     */
+    public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except)
+    {
+
+        $cache = new CacheProperties;
+        $cache->addProperty('recent-journals-id');
+
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $collector->setLimit(400)->setPage(1);
+        $set    = $collector->getJournals()->pluck('description', 'journal_id')->toArray();
+        $return = [];
+        foreach ($set as $id => $description) {
+            $id = intval($id);
+            if ($id !== $except->id) {
+                $return[] = [
+                    'id'   => $id,
+                    'name' => $id . ': ' . $description,
+                ];
+            }
+        }
+
+        $cache->store($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     */
+    public function revenueAccounts(AccountRepositoryInterface $repository)
+    {
+        $set      = $repository->getAccountsByType([AccountType::REVENUE]);
+        $filtered = $set->filter(
+            function (Account $account) {
+                if ($account->active) {
+                    return $account;
+                }
+
+                return false;
+            }
+        );
+        $return   = array_unique($filtered->pluck('name')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * @param JournalCollectorInterface $collector
+     * @param string                    $what
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function transactionJournals(JournalCollectorInterface $collector, string $what)
+    {
+        $type  = config('firefly.transactionTypesByWhat.' . $what);
+        $types = [$type];
+
+        $collector->setTypes($types)->setLimit(250)->setPage(1);
+        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
+}
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * BoxController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Json;
+
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
+use Response;
+
+/**
+ * Class BoxController
+ *
+ * @package FireflyIII\Http\Controllers\Json
+ */
+class BoxController extends Controller
+{
+    /**
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function available(BudgetRepositoryInterface $repository)
+    {
+        $start = session('start', Carbon::now()->startOfMonth());
+        $end   = session('end', Carbon::now()->endOfMonth());
+        $today = new Carbon;
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($today);
+        $cache->addProperty('box-available');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+        // get available amount
+        $currency  = app('amount')->getDefaultCurrency();
+        $available = $repository->getAvailableBudget($currency, $start, $end);
+
+
+        // get spent amount:
+        $budgets           = $repository->getActiveBudgets();
+        $budgetInformation = $repository->collectBudgetInformation($budgets, $start, $end);
+        $spent             = strval(array_sum(array_column($budgetInformation, 'spent')));
+        $left              = bcadd($available, $spent);
+        // left less than zero? then it's zero:
+        if (bccomp($left, '0') === -1) {
+            $left = '0';
+        }
+        $days   = $today->diffInDays($end) + 1;
+        $perDay = '0';
+        if ($days !== 0) {
+            $perDay = bcdiv($left, strval($days));
+        }
+
+        $return = [
+            'perDay' => app('amount')->formatAnything($currency, $perDay, false),
+            'left'   => app('amount')->formatAnything($currency, $left, false),
+        ];
+
+        $cache->store($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function balance()
+    {
+        $start = session('start', Carbon::now()->startOfMonth());
+        $end   = session('end', Carbon::now()->endOfMonth());
+
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('box-balance');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        // try a collector for income:
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)
+                  ->setTypes([TransactionType::DEPOSIT])
+                  ->withOpposingAccount();
+        $income   = strval($collector->getJournals()->sum('transaction_amount'));
+        $currency = app('amount')->getDefaultCurrency();
+
+        // expense:
+        // try a collector for expenses:
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)
+                  ->setTypes([TransactionType::WITHDRAWAL])
+                  ->withOpposingAccount();
+        $expense = strval($collector->getJournals()->sum('transaction_amount'));
+
+        $response = [
+            'income'   => app('amount')->formatAnything($currency, $income, false),
+            'expense'  => app('amount')->formatAnything($currency, $expense, false),
+            'combined' => app('amount')->formatAnything($currency, bcadd($income, $expense), false),
+        ];
+
+        $cache->store($response);
+
+        return Response::json($response);
+    }
+
+    /**
+     * @param BillRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function bills(BillRepositoryInterface $repository)
+    {
+        $start = session('start', Carbon::now()->startOfMonth());
+        $end   = session('end', Carbon::now()->endOfMonth());
+
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('box-bills');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        /*
+         * Since both this method and the chart use the exact same data, we can suffice
+         * with calling the one method in the bill repository that will get this amount.
+         */
+        $paidAmount   = bcmul($repository->getBillsPaidInRange($start, $end), '-1');
+        $unpaidAmount = $repository->getBillsUnpaidInRange($start, $end); // will be a positive amount.
+        $currency     = app('amount')->getDefaultCurrency();
+
+        $return = [
+            'paid'   => app('amount')->formatAnything($currency, $paidAmount, false),
+            'unpaid' => app('amount')->formatAnything($currency, $unpaidAmount, false),
+        ];
+        $cache->store($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function netWorth(AccountRepositoryInterface $repository)
+    {
+        $today = new Carbon(date('Y-m-d')); // needed so its per day.
+        $cache = new CacheProperties;
+        $cache->addProperty($today);
+        $cache->addProperty('box-net-worth');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+        $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $currency = app('amount')->getDefaultCurrency();
+        $balances = app('steam')->balancesByAccounts($accounts, $today);
+        $sum      = '0';
+        foreach ($balances as $entry) {
+            $sum = bcadd($sum, $entry);
+        }
+
+        $return = [
+            'net_worth' => app('amount')->formatAnything($currency, $sum, false),
+        ];
+
+        $cache->store($return);
+
+        return Response::json($return);
+    }
+
+}
--- a/app/Http/Controllers/Json/IntroController.php
+++ b/app/Http/Controllers/Json/IntroController.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * IntroController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Json;
+
+use FireflyIII\Support\Facades\Preferences;
+use Log;
+use Response;
+
+/**
+ * Class IntroController
+ *
+ * @package FireflyIII\Http\Controllers\Json
+ */
+class IntroController
+{
+
+    /**
+     * @param string $route
+     * @param string $specificPage
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getIntroSteps(string $route, string $specificPage = '')
+    {
+        $steps         = $this->getBasicSteps($route);
+        $specificSteps = $this->getSpecificSteps($route, $specificPage);
+        if (count($specificSteps) === 0) {
+            return Response::json($steps);
+        }
+        if ($this->hasOutroStep($route)) {
+            // save last step:
+            $lastStep = $steps[count($steps) - 1];
+            // remove last step:
+            array_pop($steps);
+            // merge arrays and add last step again
+            $steps   = array_merge($steps, $specificSteps);
+            $steps[] = $lastStep;
+
+        }
+        if (!$this->hasOutroStep($route)) {
+            $steps = array_merge($steps, $specificSteps);
+        }
+
+        return Response::json($steps);
+    }
+
+    /**
+     * @param string $route
+     *
+     * @return bool
+     */
+    public function hasOutroStep(string $route): bool
+    {
+        $routeKey = str_replace('.', '_', $route);
+        $elements = config(sprintf('intro.%s', $routeKey));
+        if (!is_array($elements)) {
+            return false;
+        }
+        $keys = array_keys($elements);
+
+        return in_array('outro', $keys);
+    }
+
+    /**
+     * @param string $route
+     * @param string $specialPage
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postEnable(string $route, string $specialPage = '')
+    {
+        $route = str_replace('.', '_', $route);
+        $key   = 'shown_demo_' . $route;
+        if ($specialPage !== '') {
+            $key .= '_' . $specialPage;
+        }
+        Log::debug(sprintf('Going to mark the following route as NOT done: %s with special "%s" (%s)', $route, $specialPage, $key));
+        Preferences::set($key, false);
+
+        return Response::json(['message' => trans('firefly.intro_boxes_after_refresh')]);
+    }
+
+    /**
+     * @param string $route
+     * @param string $specialPage
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postFinished(string $route, string $specialPage = '')
+    {
+        $key = 'shown_demo_' . $route;
+        if ($specialPage !== '') {
+            $key .= '_' . $specialPage;
+        }
+        Log::debug(sprintf('Going to mark the following route as done: %s with special "%s" (%s)', $route, $specialPage, $key));
+        Preferences::set($key, true);
+
+        return Response::json(['result' => sprintf('Reported demo watched for route "%s".', $route)]);
+    }
+
+    /**
+     * @param string $route
+     *
+     * @return array
+     */
+    private function getBasicSteps(string $route): array
+    {
+        $routeKey = str_replace('.', '_', $route);
+        $elements = config(sprintf('intro.%s', $routeKey));
+        $steps    = [];
+        if (is_array($elements) && count($elements) > 0) {
+            foreach ($elements as $key => $options) {
+                $currentStep = $options;
+
+                // get the text:
+                $currentStep['intro'] = trans('intro.' . $route . '_' . $key);
+
+
+                // save in array:
+                $steps[] = $currentStep;
+            }
+        }
+
+        return $steps;
+    }
+
+    /**
+     * @param string $route
+     * @param string $specificPage
+     *
+     * @return array
+     */
+    private function getSpecificSteps(string $route, string $specificPage): array
+    {
+        $steps = [];
+
+        // user is on page with specific instructions:
+        if (strlen($specificPage) > 0) {
+            $routeKey = str_replace('.', '_', $route);
+            $elements = config(sprintf('intro.%s', $routeKey . '_' . $specificPage));
+            if (is_array($elements) && count($elements) > 0) {
+                foreach ($elements as $key => $options) {
+                    $currentStep = $options;
+
+                    // get the text:
+                    $currentStep['intro'] = trans('intro.' . $route . '_' . $specificPage . '_' . $key);
+
+                    // save in array:
+                    $steps[] = $currentStep;
+                }
+            }
+        }
+
+        return $steps;
+    }
+
+}
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -13,21 +13,11 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Amount;
-use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
-use Preferences;
 use Response;

 /**
@@ -64,151 +54,6 @@ class JsonController extends Controller
        return Response::json(['html' => $view]);
    }

-    /**
-     * Returns a JSON list of all accounts.
-     *
-     * @param AccountRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *
-     */
-    public function allAccounts(AccountRepositoryInterface $repository)
-    {
-        $return = array_unique(
-            $repository->getAccountsByType(
-                [AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]
-            )->pluck('name')->toArray()
-        );
-        sort($return);
-
-        return Response::json($return);
-
-    }
-
-    /**
-     * @param JournalCollectorInterface $collector
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function allTransactionJournals(JournalCollectorInterface $collector)
-    {
-        $collector->setLimit(100)->setPage(1);
-        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
-        sort($return);
-
-        return Response::json($return);
-
-
-    }
-
-    /**
-     * @param BillRepositoryInterface $repository
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function boxBillsPaid(BillRepositoryInterface $repository)
-    {
-        $start = session('start', Carbon::now()->startOfMonth());
-        $end   = session('end', Carbon::now()->endOfMonth());
-
-        /*
-         * Since both this method and the chart use the exact same data, we can suffice
-         * with calling the one method in the bill repository that will get this amount.
-         */
-        $amount   = $repository->getBillsPaidInRange($start, $end); // will be a negative amount.
-        $amount   = bcmul($amount, '-1');
-        $currency = Amount::getDefaultCurrency();
-
-        $data = ['box' => 'bills-paid', 'amount' => Amount::formatAnything($currency, $amount, false), 'amount_raw' => $amount];
-
-        return Response::json($data);
-    }
-
-    /**
-     * @param BillRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function boxBillsUnpaid(BillRepositoryInterface $repository)
-    {
-        $start    = session('start', Carbon::now()->startOfMonth());
-        $end      = session('end', Carbon::now()->endOfMonth());
-        $amount   = $repository->getBillsUnpaidInRange($start, $end); // will be a positive amount.
-        $currency = Amount::getDefaultCurrency();
-        $data     = ['box' => 'bills-unpaid', 'amount' => Amount::formatAnything($currency, $amount, false), 'amount_raw' => $amount];
-
-        return Response::json($data);
-    }
-
-    /**
-     * @return \Illuminate\Http\JsonResponse
-     * @internal param AccountTaskerInterface $accountTasker
-     * @internal param AccountRepositoryInterface $repository
-     *
-     */
-    public function boxIn()
-    {
-        $start = session('start', Carbon::now()->startOfMonth());
-        $end   = session('end', Carbon::now()->endOfMonth());
-
-        // works for json too!
-        $cache = new CacheProperties;
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('box-in');
-        if ($cache->has()) {
-            return Response::json($cache->get()); // @codeCoverageIgnore
-        }
-
-        // try a collector for income:
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setAllAssetAccounts()->setRange($start, $end)
-                  ->setTypes([TransactionType::DEPOSIT])
-                  ->withOpposingAccount();
-
-        $amount   = strval($collector->getJournals()->sum('transaction_amount'));
-        $currency = Amount::getDefaultCurrency();
-        $data     = ['box' => 'in', 'amount' => Amount::formatAnything($currency, $amount, false), 'amount_raw' => $amount];
-        $cache->store($data);
-
-        return Response::json($data);
-    }
-
-    /**
-     * @return \Symfony\Component\HttpFoundation\Response
-     * @internal param AccountTaskerInterface $accountTasker
-     * @internal param AccountRepositoryInterface $repository
-     *
-     */
-    public function boxOut()
-    {
-        $start = session('start', Carbon::now()->startOfMonth());
-        $end   = session('end', Carbon::now()->endOfMonth());
-
-        // works for json too!
-        $cache = new CacheProperties;
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('box-out');
-        if ($cache->has()) {
-            return Response::json($cache->get()); // @codeCoverageIgnore
-        }
-
-        // try a collector for expenses:
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setAllAssetAccounts()->setRange($start, $end)
-                  ->setTypes([TransactionType::WITHDRAWAL])
-                  ->withOpposingAccount();
-        $amount   = strval($collector->getJournals()->sum('transaction_amount'));
-        $currency = Amount::getDefaultCurrency();
-        $data     = ['box' => 'out', 'amount' => Amount::formatAnything($currency, $amount, false), 'amount_raw' => $amount];
-        $cache->store($data);
-
-        return Response::json($data);
-    }
-
    /**
     * @param BudgetRepositoryInterface $repository
     *
@@ -237,46 +82,6 @@ class JsonController extends Controller
        return Response::json($return);
    }

-    /**
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function endTour()
-    {
-        Preferences::set('tour', false);
-
-        return Response::json('true');
-    }
-
-    /**
-     * Returns a JSON list of all beneficiaries.
-     *
-     * @param AccountRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *
-     */
-    public function expenseAccounts(AccountRepositoryInterface $repository)
-    {
-        $return = array_unique($repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY])->pluck('name')->toArray());
-        sort($return);
-
-        return Response::json($return);
-    }
-
-    /**
-     * @param AccountRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *
-     */
-    public function revenueAccounts(AccountRepositoryInterface $repository)
-    {
-        $return = array_unique($repository->getAccountsByType([AccountType::REVENUE])->pluck('name')->toArray());
-        sort($return);
-
-        return Response::json($return);
-    }
-
    /**
     * Returns a JSON list of all beneficiaries.
     *
@@ -293,54 +98,6 @@ class JsonController extends Controller

    }

-    /**
-     *
-     */
-    public function tour()
-    {
-        $pref = Preferences::get('tour', true);
-        if (!$pref) {
-            throw new FireflyException('Cannot find preference for tour. Exit.'); // @codeCoverageIgnore
-        }
-        $headers = ['main-content', 'sidebar-toggle', 'account-menu', 'budget-menu', 'report-menu', 'transaction-menu', 'option-menu', 'main-content-end'];
-        $steps   = [];
-        foreach ($headers as $header) {
-            $steps[] = [
-                'element' => '#' . $header,
-                'title'   => trans('help.' . $header . '-title'),
-                'content' => trans('help.' . $header . '-text'),
-            ];
-        }
-        $steps[0]['orphan']    = true;// orphan and backdrop for first element.
-        $steps[0]['backdrop']  = true;
-        $steps[1]['placement'] = 'left';// sidebar position left:
-        $steps[7]['orphan']    = true; // final in the center again.
-        $steps[7]['backdrop']  = true;
-        $template              = view('json.tour')->render();
-
-        return Response::json(['steps' => $steps, 'template' => $template]);
-    }
-
-    /**
-     * @param JournalCollectorInterface $collector
-     * @param string                    $what
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function transactionJournals(JournalCollectorInterface $collector, string $what)
-    {
-        $type  = config('firefly.transactionTypesByWhat.' . $what);
-        $types = [$type];
-
-        $collector->setTypes($types)->setLimit(100)->setPage(1);
-        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
-        sort($return);
-
-        return Response::json($return);
-
-
-    }
-
    /**
     * @param JournalRepositoryInterface $repository
     *
@@ -365,10 +122,11 @@ class JsonController extends Controller
        $keys     = array_keys(config('firefly.rule-triggers'));
        $triggers = [];
        foreach ($keys as $key) {
-            if ($key != 'user_action') {
+            if ($key !== 'user_action') {
                $triggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice');
            }
        }
+        asort($triggers);

        $view = view('rules.partials.trigger', compact('triggers', 'count'))->render();

--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -54,7 +54,6 @@ class NewUserController extends Controller
        View::share('title', trans('firefly.welcome'));
        View::share('mainTitleIcon', 'fa-fire');

-
        $types = config('firefly.accountTypesByIdentifier.asset');
        $count = $repository->count($types);

@@ -74,30 +73,13 @@ class NewUserController extends Controller
     */
    public function submit(NewUserFormRequest $request, AccountRepositoryInterface $repository)
    {
-        $count = 1;
        // create normal asset account:
        $this->createAssetAccount($request, $repository);

        // create savings account
-        $savingBalance = strval($request->get('savings_balance')) === '' ? '0' : strval($request->get('savings_balance'));
-        if (bccomp($savingBalance, '0') !== 0) {
-            $this->createSavingsAccount($request, $repository);
-            $count++;
-        }
+        $this->createSavingsAccount($request, $repository);

-
-        // create credit card.
-        $limit = strval($request->get('credit_card_limit')) === '' ? '0' : strval($request->get('credit_card_limit'));
-        if (bccomp($limit, '0') !== 0) {
-            $this->storeCreditCard($request, $repository);
-            $count++;
-        }
-        $message = strval(trans('firefly.stored_new_accounts_new_user'));
-        if ($count == 1) {
-            $message = strval(trans('firefly.stored_new_account_new_user'));
-        }
-
-        Session::flash('success', $message);
+        Session::flash('success', strval(trans('firefly.stored_new_accounts_new_user')));
        Preferences::mark();

        return redirect(route('index'));
@@ -152,29 +134,4 @@ class NewUserController extends Controller
        return true;
    }

-    /**
-     * @param NewUserFormRequest         $request
-     * @param AccountRepositoryInterface $repository
-     *
-     * @return bool
-     */
-    private function storeCreditCard(NewUserFormRequest $request, AccountRepositoryInterface $repository): bool
-    {
-        $creditAccount = [
-            'name'                   => 'Credit card',
-            'iban'                   => null,
-            'accountType'            => 'asset',
-            'virtualBalance'         => round($request->get('credit_card_limit'), 12),
-            'active'                 => true,
-            'accountRole'            => 'ccAsset',
-            'openingBalance'         => null,
-            'openingBalanceDate'     => null,
-            'openingBalanceCurrency' => intval($request->input('amount_currency_id_credit_card_limit')),
-            'ccType'                 => 'monthlyFull',
-            'ccMonthlyPaymentDate'   => Carbon::now()->year . '-01-01',
-        ];
-        $repository->store($creditAccount);
-
-        return true;
-    }
 }
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -13,7 +13,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Amount;
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Http\Requests\PiggyBankFormRequest;
@@ -89,7 +88,7 @@ class PiggyBankController extends Controller
        /** @var Carbon $date */
        $date          = session('end', Carbon::now()->endOfMonth());
        $leftOnAccount = $piggyBank->leftOnAccount($date);
-        $savedSoFar    = $piggyBank->currentRelevantRep()->currentamount?? '0';
+        $savedSoFar    = $piggyBank->currentRelevantRep()->currentamount ?? '0';
        $leftToSave    = bcsub($piggyBank->targetamount, $savedSoFar);
        $maxAmount     = min($leftOnAccount, $leftToSave);

@@ -277,14 +276,14 @@ class PiggyBankController extends Controller
    public function postAdd(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
    {
        $amount   = $request->get('amount');
-        $currency = Amount::getDefaultCurrency();
+        $currency = app('amount')->getDefaultCurrency();
        if ($repository->canAddAmount($piggyBank, $amount)) {
            $repository->addAmount($piggyBank, $amount);
            Session::flash(
                'success', strval(
                             trans(
                                 'firefly.added_amount_to_piggy',
-                                 ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
+                                 ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
                             )
                         )
            );
@@ -296,7 +295,10 @@ class PiggyBankController extends Controller
        Log::error('Cannot add ' . $amount . ' because canAddAmount returned false.');
        Session::flash(
            'error', strval(
-                       trans('firefly.cannot_add_amount_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
+                       trans(
+                           'firefly.cannot_add_amount_piggy',
+                           ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)]
+                       )
                   )
        );

@@ -313,12 +315,16 @@ class PiggyBankController extends Controller
    public function postRemove(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
    {
        $amount   = $request->get('amount');
-        $currency = Amount::getDefaultCurrency();
+        $currency = app('amount')->getDefaultCurrency();
        if ($repository->canRemoveAmount($piggyBank, $amount)) {
            $repository->removeAmount($piggyBank, $amount);
            Session::flash(
                'success',
-                strval(trans('firefly.removed_amount_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => $piggyBank->name]))
+                strval(
+                    trans(
+                        'firefly.removed_amount_from_piggy', ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
+                    )
+                )
            );
            Preferences::mark();

@@ -329,7 +335,10 @@ class PiggyBankController extends Controller

        Session::flash(
            'error', strval(
-                       trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
+                       trans(
+                           'firefly.cannot_remove_from_piggy',
+                           ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)]
+                       )
                   )
        );

--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -85,27 +85,27 @@ class PreferencesController extends Controller
     */
    public function index(AccountRepositoryInterface $repository)
    {
-        $accounts              = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
-        $viewRangePref         = Preferences::get('viewRange', '1M');
-        $viewRange             = $viewRangePref->data;
-        $frontPageAccounts     = Preferences::get('frontPageAccounts', []);
-        $language              = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
-        $transactionPageSize   = Preferences::get('transactionPageSize', 50)->data;
-        $customFiscalYear      = Preferences::get('customFiscalYear', 0)->data;
-        $showDepositsFrontpage = Preferences::get('showDepositsFrontpage', false)->data;
-        $fiscalYearStartStr    = Preferences::get('fiscalYearStart', '01-01')->data;
-        $fiscalYearStart       = date('Y') . '-' . $fiscalYearStartStr;
-        $tjOptionalFields      = Preferences::get('transaction_journal_optional_fields', [])->data;
-        $is2faEnabled          = Preferences::get('twoFactorAuthEnabled', 0)->data; // twoFactorAuthEnabled
-        $has2faSecret          = !is_null(Preferences::get('twoFactorAuthSecret')); // hasTwoFactorAuthSecret
-        $showIncomplete        = env('SHOW_INCOMPLETE_TRANSLATIONS', false) === true;
+        $accounts            = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $viewRangePref       = Preferences::get('viewRange', '1M');
+        $viewRange           = $viewRangePref->data;
+        $frontPageAccounts   = Preferences::get('frontPageAccounts', []);
+        $language            = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
+        $transactionPageSize = Preferences::get('transactionPageSize', 50)->data;
+        $customFiscalYear    = Preferences::get('customFiscalYear', 0)->data;
+        $showDeps            = Preferences::get('showDepositsFrontpage', false)->data;
+        $fiscalYearStartStr  = Preferences::get('fiscalYearStart', '01-01')->data;
+        $fiscalYearStart     = date('Y') . '-' . $fiscalYearStartStr;
+        $tjOptionalFields    = Preferences::get('transaction_journal_optional_fields', [])->data;
+        $is2faEnabled        = Preferences::get('twoFactorAuthEnabled', 0)->data; // twoFactorAuthEnabled
+        $has2faSecret        = !is_null(Preferences::get('twoFactorAuthSecret')); // hasTwoFactorAuthSecret
+        $showIncomplete      = env('SHOW_INCOMPLETE_TRANSLATIONS', false) === true;

        return view(
            'preferences.index',
            compact(
                'language', 'accounts', 'frontPageAccounts', 'tjOptionalFields',
                'viewRange', 'customFiscalYear', 'transactionPageSize', 'fiscalYearStart', 'is2faEnabled',
-                'has2faSecret', 'showIncomplete', 'showDepositsFrontpage'
+                'has2faSecret', 'showIncomplete', 'showDeps'
            )
        );
    }
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -13,14 +13,20 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

+use Auth;
+use FireflyIII\Events\UserChangedEmail;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Exceptions\ValidationException;
 use FireflyIII\Http\Middleware\IsLimitedUser;
 use FireflyIII\Http\Requests\DeleteAccountFormRequest;
+use FireflyIII\Http\Requests\EmailFormRequest;
 use FireflyIII\Http\Requests\ProfileFormRequest;
+use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Hash;
 use Log;
+use Preferences;
 use Session;
 use View;

@@ -47,10 +53,23 @@ class ProfileController extends Controller
                return $next($request);
            }
        );
-        $this->middleware(IsLimitedUser::class);
+        $this->middleware(IsLimitedUser::class)->except(['confirmEmailChange', 'undoEmailChange']);

    }

+    /**
+     * @return View
+     */
+    public function changeEmail()
+    {
+        $title        = auth()->user()->email;
+        $email        = auth()->user()->email;
+        $subTitle     = strval(trans('firefly.change_your_email'));
+        $subTitleIcon = 'fa-envelope';
+
+        return view('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
+    }
+
    /**
     * @return View
     */
@@ -63,6 +82,37 @@ class ProfileController extends Controller
        return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
    }

+    /**
+     * @param string $token
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws FireflyException
+     */
+    public function confirmEmailChange(string $token)
+    {
+        // find preference with this token value.
+        $set  = Preferences::findByName('email_change_confirm_token');
+        $user = null;
+        /** @var Preference $preference */
+        foreach ($set as $preference) {
+            if ($preference->data === $token) {
+                $user = $preference->user;
+            }
+        }
+        // update user to clear blocked and blocked_code.
+        if (is_null($user)) {
+            throw new FireflyException('Invalid token.');
+        }
+        $user->blocked      = 0;
+        $user->blocked_code = '';
+        $user->save();
+
+        // return to login.
+        Session::flash('success', strval(trans('firefly.login_with_new_email')));
+
+        return redirect(route('login'));
+    }
+
    /**
     * @return View
     */
@@ -84,7 +134,57 @@ class ProfileController extends Controller
        $subTitle = auth()->user()->email;
        $userId   = auth()->user()->id;

-        return view('profile.index', compact('subTitle', 'userId'));
+        // get access token or create one.
+        $accessToken = Preferences::get('access_token', null);
+        if (is_null($accessToken)) {
+            $token       = auth()->user()->generateAccessToken();
+            $accessToken = Preferences::set('access_token', $token);
+        }
+
+        return view('profile.index', compact('subTitle', 'userId', 'accessToken'));
+    }
+
+    /**
+     * @param EmailFormRequest        $request
+     * @param UserRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function postChangeEmail(EmailFormRequest $request, UserRepositoryInterface $repository)
+    {
+        /** @var User $user */
+        $user     = auth()->user();
+        $newEmail = $request->string('email');
+        $oldEmail = $user->email;
+        if ($newEmail === $user->email) {
+            Session::flash('error', strval(trans('firefly.email_not_changed')));
+
+            return redirect(route('profile.change-email'))->withInput();
+        }
+        $existing = $repository->findByEmail($newEmail);
+        if (!is_null($existing)) {
+            // force user logout.
+            $this->guard()->logout();
+            $request->session()->invalidate();
+
+            Session::flash('success', strval(trans('firefly.email_changed')));
+
+            return redirect(route('index'));
+        }
+
+        // now actually update user:
+        $repository->changeEmail($user, $newEmail);
+
+        // call event.
+        $ipAddress = $request->ip();
+        event(new UserChangedEmail($user, $newEmail, $oldEmail, $ipAddress));
+
+        // force user logout.
+        Auth::guard()->logout();
+        $request->session()->invalidate();
+        Session::flash('success', strval(trans('firefly.email_changed')));
+
+        return redirect(route('index'));
    }

    /**
@@ -140,6 +240,64 @@ class ProfileController extends Controller
        return redirect(route('index'));
    }

+    /**
+     *
+     */
+    function regenerate()
+    {
+        $token = auth()->user()->generateAccessToken();
+        Preferences::set('access_token', $token);
+        Session::flash('success', strval(trans('firefly.token_regenerated')));
+
+        return redirect(route('profile.index'));
+    }
+
+    /**
+     * @param string $token
+     * @param string $hash
+     *
+     * @throws FireflyException
+     */
+    public function undoEmailChange(string $token, string $hash)
+    {
+        // find preference with this token value.
+        $set  = Preferences::findByName('email_change_undo_token');
+        $user = null;
+        /** @var Preference $preference */
+        foreach ($set as $preference) {
+            if ($preference->data === $token) {
+                $user = $preference->user;
+            }
+        }
+        if (is_null($user)) {
+            throw new FireflyException('Invalid token.');
+        }
+
+        // found user.
+        // which email address to return to?
+        $set   = Preferences::beginsWith($user, 'previous_email_');
+        $match = null;
+        foreach ($set as $entry) {
+            $hashed = hash('sha256', $entry->data);
+            if ($hashed === $hash) {
+                $match = $entry->data;
+                break;
+            }
+        }
+        if (is_null($match)) {
+            throw new FireflyException('Invalid token.');
+        }
+        // change user back
+        $user->email        = $match;
+        $user->blocked      = 0;
+        $user->blocked_code = '';
+        $user->save();
+
+        // return to login.
+        Session::flash('success', strval(trans('firefly.login_with_old_email')));
+
+        return redirect(route('login'));
+    }

    /**
     * @param User   $user
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -13,15 +13,21 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

+use Carbon\Carbon;
+use ExpandedForm;
 use FireflyIII\Http\Requests\RuleFormRequest;
+use FireflyIII\Http\Requests\SelectTransactionsRequest;
 use FireflyIII\Http\Requests\TestRuleFormRequest;
+use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\RuleTrigger;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
-use FireflyIII\Rules\TransactionMatcher;
+use FireflyIII\TransactionRules\TransactionMatcher;
 use Illuminate\Http\Request;
 use Preferences;
 use Response;
@@ -160,10 +166,13 @@ class RuleController extends Controller
     */
    public function edit(Request $request, RuleRepositoryInterface $repository, Rule $rule)
    {
-        $oldTriggers  = $this->getCurrentTriggers($rule);
-        $triggerCount = count($oldTriggers);
-        $oldActions   = $this->getCurrentActions($rule);
-        $actionCount  = count($oldActions);
+        /** @var RuleGroupRepositoryInterface $ruleGroupRepository */
+        $ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
+        $oldTriggers         = $this->getCurrentTriggers($rule);
+        $triggerCount        = count($oldTriggers);
+        $oldActions          = $this->getCurrentActions($rule);
+        $actionCount         = count($oldActions);
+        $ruleGroups          = ExpandedForm::makeSelectList($ruleGroupRepository->get());

        // has old input?
        if ($request->old()) {
@@ -185,7 +194,47 @@ class RuleController extends Controller
        Session::flash('gaEventCategory', 'rules');
        Session::flash('gaEventAction', 'edit-rule');

-        return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
+        return view(
+            'rules.rule.edit', compact(
+                                 'rule', 'subTitle',
+                                 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
+                             )
+        );
+    }
+
+    /**
+     * Execute the given rule on a set of existing transactions
+     *
+     * @param SelectTransactionsRequest  $request
+     * @param AccountRepositoryInterface $repository
+     * @param Rule                       $rule
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     * @internal param RuleGroup $ruleGroup
+     */
+    public function execute(SelectTransactionsRequest $request, AccountRepositoryInterface $repository, Rule $rule)
+    {
+        // Get parameters specified by the user
+        $accounts  = $repository->getAccountsById($request->get('accounts'));
+        $startDate = new Carbon($request->get('start_date'));
+        $endDate   = new Carbon($request->get('end_date'));
+
+        // Create a job to do the work asynchronously
+        $job = new ExecuteRuleOnExistingTransactions($rule);
+
+        // Apply parameters to the job
+        $job->setUser(auth()->user());
+        $job->setAccounts($accounts);
+        $job->setStartDate($startDate);
+        $job->setEndDate($endDate);
+
+        // Dispatch a new job to execute it in a queue
+        $this->dispatch($job);
+
+        // Tell the user that the job is queued
+        Session::flash('success', strval(trans('firefly.applied_rule_selection', ['title' => $rule->title])));
+
+        return redirect()->route('rules.index');
    }

    /**
@@ -238,6 +287,25 @@ class RuleController extends Controller

    }

+    /**
+     * @param AccountRepositoryInterface $repository
+     * @param Rule                       $rule
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function selectTransactions(AccountRepositoryInterface $repository, Rule $rule)
+    {
+        // does the user have shared accounts?
+        $accounts        = $repository->getAccountsByType([AccountType::ASSET]);
+        $accountList     = ExpandedForm::makeSelectList($accounts);
+        $checkedAccounts = array_keys($accountList);
+        $first           = session('first')->format('Y-m-d');
+        $today           = Carbon::create()->format('Y-m-d');
+        $subTitle        = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
+
+        return view('rules.rule.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'rule', 'subTitle'));
+    }
+
    /**
     * @param RuleFormRequest         $request
     * @param RuleRepositoryInterface $repository
@@ -282,7 +350,7 @@ class RuleController extends Controller
        // build trigger array from response
        $triggers = $this->getValidTriggerList($request);

-        if (count($triggers) == 0) {
+        if (count($triggers) === 0) {
            return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]);
        }

@@ -294,14 +362,61 @@ class RuleController extends Controller
        $matcher->setLimit($limit);
        $matcher->setRange($range);
        $matcher->setTriggers($triggers);
-        $matchingTransactions = $matcher->findMatchingTransactions();
+        $matchingTransactions = $matcher->findTransactionsByTriggers();

        // Warn the user if only a subset of transactions is returned
        $warning = '';
-        if (count($matchingTransactions) == $limit) {
+        if (count($matchingTransactions) === $limit) {
            $warning = trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]);
        }
-        if (count($matchingTransactions) == 0) {
+        if (count($matchingTransactions) === 0) {
+            $warning = trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]);
+        }
+
+        // Return json response
+        $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render();
+
+        return Response::json(['html' => $view, 'warning' => $warning]);
+    }
+
+    /**
+     * This method allows the user to test a certain set of rule triggers. The rule triggers are grabbed from
+     * the rule itself.
+     *
+     * This method will parse and validate those rules and create a "TransactionMatcher" which will attempt
+     * to find transaction journals matching the users input. A maximum range of transactions to try (range) and
+     * a maximum number of transactions to return (limit) are set as well.
+     *
+     *
+     * @param Rule $rule
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function testTriggersByRule(Rule $rule)
+    {
+
+        $triggers = $rule->ruleTriggers;
+
+        if (count($triggers) === 0) {
+            return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]);
+        }
+
+        $limit = config('firefly.test-triggers.limit');
+        $range = config('firefly.test-triggers.range');
+
+        /** @var TransactionMatcher $matcher */
+        $matcher = app(TransactionMatcher::class);
+        $matcher->setLimit($limit);
+        $matcher->setRange($range);
+        $matcher->setRule($rule);
+        $matchingTransactions = $matcher->findTransactionsByRule();
+
+        // Warn the user if only a subset of transactions is returned
+        $warning = '';
+        if (count($matchingTransactions) === $limit) {
+            $warning = trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]);
+        }
+        if (count($matchingTransactions) === 0) {
            $warning = trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]);
        }

@@ -416,7 +531,7 @@ class RuleController extends Controller
            $actions[] = view(
                'rules.partials.action',
                [
-                    'oldTrigger' => $entry->action_type,
+                    'oldAction'  => $entry->action_type,
                    'oldValue'   => $entry->action_value,
                    'oldChecked' => $entry->stop_processing,
                    'count'      => $count,
@@ -440,7 +555,7 @@ class RuleController extends Controller

        /** @var RuleTrigger $entry */
        foreach ($rule->ruleTriggers as $entry) {
-            if ($entry->trigger_type != 'user_action') {
+            if ($entry->trigger_type !== 'user_action') {
                $count      = ($index + 1);
                $triggers[] = view(
                    'rules.partials.trigger',
--- a/app/Http/Controllers/RuleGroupController.php
+++ b/app/Http/Controllers/RuleGroupController.php
@@ -178,7 +178,7 @@ class RuleGroupController extends Controller
        $this->dispatch($job);

        // Tell the user that the job is queued
-        Session::flash('success', strval(trans('firefly.executed_group_on_existing_transactions', ['title' => $ruleGroup->title])));
+        Session::flash('success', strval(trans('firefly.applied_rule_group_selection', ['title' => $ruleGroup->title])));

        return redirect()->route('rules.index');
    }
@@ -197,7 +197,7 @@ class RuleGroupController extends Controller
        $checkedAccounts = array_keys($accountList);
        $first           = session('first')->format('Y-m-d');
        $today           = Carbon::create()->format('Y-m-d');
-        $subTitle        = (string)trans('firefly.execute_on_existing_transactions');
+        $subTitle        = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);

        return view('rules.rule-group.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'ruleGroup', 'subTitle'));
    }
@@ -246,14 +246,14 @@ class RuleGroupController extends Controller
     * @param RuleGroupRepositoryInterface $repository
     * @param RuleGroup                    $ruleGroup
     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
    public function update(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
    {
        $data = [
            'title'       => $request->input('title'),
            'description' => $request->input('description'),
-            'active'      => intval($request->input('active')) == 1,
+            'active'      => intval($request->input('active')) === 1,
        ];

        $repository->update($ruleGroup, $data);
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -15,7 +15,7 @@ namespace FireflyIII\Http\Controllers;

 use FireflyIII\Support\Search\SearchInterface;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
+use Response;
 use View;

 /**
@@ -51,47 +51,29 @@ class SearchController extends Controller
     */
    public function index(Request $request, SearchInterface $searcher)
    {
-        // yes, hard coded values:
-        $minSearchLen = 1;
-        $limit        = 20;
+        $fullQuery = strval($request->get('q'));

-        // ui stuff:
-        $subTitle = '';
+        // parse search terms:
+        $searcher->parseQuery($fullQuery);
+        $query    = $searcher->getWordsAsString();
+        $subTitle = trans('breadcrumbs.search_result', ['query' => $query]);

-        // query stuff
-        $query        = null;
-        $result       = [];
-        $rawQuery     = $request->get('q');
-        $hasModifiers = true;
-        $modifiers    = [];
+        return view('search.index', compact('query', 'fullQuery', 'subTitle'));
+    }

-        if (!is_null($request->get('q')) && strlen($request->get('q')) >= $minSearchLen) {
-            // parse query, find modifiers:
-            // set limit for search
-            $searcher->setLimit($limit);
-            $searcher->parseQuery($request->get('q'));
+    public function search(Request $request, SearchInterface $searcher)
+    {
+        $fullQuery = strval($request->get('query'));

-            $transactions = $searcher->searchTransactions();
-            $accounts     = new Collection;
-            $categories   = new Collection;
-            $tags         = new Collection;
-            $budgets      = new Collection;
+        // parse search terms:
+        $searcher->parseQuery($fullQuery);
+        $searcher->setLimit(20);
+        $transactions = $searcher->searchTransactions();
+        $html         = view('search.search', compact('transactions'))->render();

-            // no special search thing?
-            if (!$searcher->hasModifiers()) {
-                $hasModifiers = false;
-                $accounts     = $searcher->searchAccounts();
-                $categories   = $searcher->searchCategories();
-                $budgets      = $searcher->searchBudgets();
-                $tags         = $searcher->searchTags();
-            }
-            $query    = $searcher->getWordsAsString();
-            $subTitle = trans('firefly.search_results_for', ['query' => $query]);
-            $result   = ['transactions' => $transactions, 'accounts' => $accounts, 'categories' => $categories, 'budgets' => $budgets, 'tags' => $tags];
+        return Response::json(['count' => $transactions->count(), 'html' => $html]);

-        }

-        return view('search.index', compact('rawQuery', 'hasModifiers', 'modifiers', 'subTitle', 'limit', 'query', 'result'));
    }

 }
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -22,7 +22,6 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use Log;
 use Navigation;
 use Preferences;
 use Session;
@@ -44,9 +43,6 @@ use View;
 class TagController extends Controller
 {

-    /** @var array */
-    public $tagOptions = [];
-
    /** @var  TagRepositoryInterface */
    protected $repository;

@@ -57,21 +53,13 @@ class TagController extends Controller
    {
        parent::__construct();
        View::share('hideTags', true);
+        $this->redirectUri = route('tags.index');

        $this->middleware(
            function ($request, $next) {
                $this->repository = app(TagRepositoryInterface::class);
-                $this->tagOptions = [
-                    'nothing'        => trans('firefly.regular_tag'),
-                    'balancingAct'   => trans('firefly.balancing_act'),
-                    'advancePayment' => trans('firefly.advance_payment'),
-                ];
-
-
                View::share('title', strval(trans('firefly.tags')));
                View::share('mainTitleIcon', 'fa-tags');
-                View::share('tagOptions', $this->tagOptions);
-

                return $next($request);
            }
@@ -79,22 +67,16 @@ class TagController extends Controller
    }

    /**
-     * @param Request $request
+     * Create a new tag.
     *
     * @return View
     */
-    public function create(Request $request)
+    public function create()
    {
        $subTitle     = trans('firefly.new_tag');
        $subTitleIcon = 'fa-tag';
        $apiKey       = env('GOOGLE_MAPS_API_KEY', '');

-        $preFilled = [
-            'tagMode' => 'nothing',
-        ];
-        if (!$request->old('tagMode')) {
-            Session::flash('preFilled', $preFilled);
-        }
        // put previous url in session if not redirect from store (not "create another").
        if (session('tags.create.fromStore') !== true) {
            $this->rememberPreviousUri('tags.create.uri');
@@ -107,13 +89,15 @@ class TagController extends Controller
    }

    /**
+     * Delete a tag
+     *
     * @param Tag $tag
     *
     * @return View
     */
    public function delete(Tag $tag)
    {
-        $subTitle = trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]);
+        $subTitle = trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]);

        // put previous url in session
        $this->rememberPreviousUri('tags.delete.uri');
@@ -141,38 +125,18 @@ class TagController extends Controller
    }

    /**
-     * @param Tag                    $tag
+     * Edit a tag
     *
-     * @param TagRepositoryInterface $repository
+     * @param Tag $tag
     *
     * @return View
     */
-    public function edit(Tag $tag, TagRepositoryInterface $repository)
+    public function edit(Tag $tag)
    {
        $subTitle     = trans('firefly.edit_tag', ['tag' => $tag->tag]);
        $subTitleIcon = 'fa-tag';
        $apiKey       = env('GOOGLE_MAPS_API_KEY', '');

-        /*
-         * Default tag options (again)
-         */
-        $tagOptions = $this->tagOptions;
-
-        /*
-         * Can this tag become another type?
-         */
-        $allowAdvance        = $repository->tagAllowAdvance($tag);
-        $allowToBalancingAct = $repository->tagAllowBalancing($tag);
-
-        // edit tag options:
-        if ($allowAdvance === false) {
-            unset($tagOptions['advancePayment']);
-        }
-        if ($allowToBalancingAct === false) {
-            unset($tagOptions['balancingAct']);
-        }
-
-
        // put previous url in session if not redirect from store (not "return_to_edit").
        if (session('tags.edit.fromUpdate') !== true) {
            $this->rememberPreviousUri('tags.edit.uri');
@@ -181,46 +145,43 @@ class TagController extends Controller
        Session::flash('gaEventCategory', 'tags');
        Session::flash('gaEventAction', 'edit');

-        return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'tagOptions', 'apiKey'));
+        return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'apiKey'));
    }

    /**
+     * View all tags
+     *
     * @param TagRepositoryInterface $repository
     *
     * @return View
     */
    public function index(TagRepositoryInterface $repository)
    {
-        $title         = 'Tags';
-        $mainTitleIcon = 'fa-tags';
-        $types         = ['nothing', 'balancingAct', 'advancePayment'];
-        $count         = $repository->count();
-
-        // loop each types and get the tags, group them by year.
-        $collection = [];
-        foreach ($types as $type) {
-
-            /** @var Collection $tags */
-            $tags = $repository->getByType($type);
-            $tags = $tags->sortBy(
-                function (Tag $tag) {
-                    $date = !is_null($tag->date) ? $tag->date->format('Ymd') : '000000';
-
-                    return strtolower($date . $tag->tag);
-                }
-            );
-
-            /** @var Tag $tag */
-            foreach ($tags as $tag) {
-
-                $year           = is_null($tag->date) ? trans('firefly.no_year') : $tag->date->year;
-                $monthFormatted = is_null($tag->date) ? trans('firefly.no_month') : $tag->date->formatLocalized($this->monthFormat);
-
-                $collection[$type][$year][$monthFormatted][] = $tag;
-            }
+        // start with oldest tag
+        $oldestTag = $repository->oldestTag();
+        /** @var Carbon $start */
+        $start = new Carbon;
+        if (!is_null($oldestTag)) {
+            /** @var Carbon $start */
+            $start = $oldestTag->date;
+        }
+        if (is_null($oldestTag)) {
+            /** @var Carbon $start */
+            $start = clone(session('first'));
        }

-        return view('tags.index', compact('title', 'mainTitleIcon', 'types', 'collection', 'count'));
+        $now               = new Carbon;
+        $clouds            = [];
+        $clouds['no-date'] = $repository->tagCloud(null);
+        while ($now > $start) {
+            $year          = $now->year;
+            $clouds[$year] = $repository->tagCloud($year);
+
+            $now->subYear();
+        }
+        $count = $repository->count();
+
+        return view('tags.index', compact('clouds', 'count'));
    }

    /**
@@ -236,26 +197,21 @@ class TagController extends Controller
        // default values:
        $subTitle     = $tag->tag;
        $subTitleIcon = 'fa-tag';
-        $page         = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $page         = intval($request->get('page'));
        $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
-        $count        = 0;
-        $loop         = 0;
        $range        = Preferences::get('viewRange', '1M')->data;
        $start        = null;
        $end          = null;
        $periods      = new Collection;
        $apiKey       = env('GOOGLE_MAPS_API_KEY', '');
-        $sum          = '0';
-        $path         = 'tags/show/' . $tag->id;
-
+        $path         = route('tags.show', [$tag->id]);

        // prep for "all" view.
        if ($moment === 'all') {
            $subTitle = trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]);
            $start    = $repository->firstUseDate($tag);
            $end      = new Carbon;
-            $sum      = $repository->sumOfTag($tag);
-            $path     = 'tags/show/' . $tag->id . '/all';
+            $path     = route('tags.show', [$tag->id, 'all']);
        }

        // prep for "specific date" view.
@@ -268,12 +224,14 @@ class TagController extends Controller
                 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
            );
            $periods  = $this->getPeriodOverview($tag);
-            $sum      = $repository->sumOfTag($tag, $start, $end);
+            $path     = route('tags.show', [$tag->id, $moment]);
        }

        // prep for current period
        if (strlen($moment) === 0) {
-            $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
+            /** @var Carbon $start */
+            $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
+            /** @var Carbon $end */
            $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
            $periods  = $this->getPeriodOverview($tag);
            $subTitle = trans(
@@ -281,37 +239,19 @@ class TagController extends Controller
                ['tag' => $tag->tag, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
            );
        }
-        // grab journals, but be prepared to jump a period back to get the right ones:
-        Log::info('Now at tag loop start.');
-        while ($count === 0 && $loop < 3) {
-            $loop++;
-            Log::info(sprintf('Count is zero, search for journals between %s and %s (pagesize %d, page %d).', $start, $end, $pageSize, $page));
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class);
-            $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount()
-                      ->setTag($tag)->withBudgetInformation()->withCategoryInformation()->removeFilter(InternalTransferFilter::class);
-            $journals = $collector->getPaginatedJournals();
-            $journals->setPath($path);
-            $count = $journals->getCollection()->count();
-            if ($count === 0 && $loop < 3) {
-                $start->subDay();
-                $start = Navigation::startOfPeriod($start, $range);
-                $end   = Navigation::endOfPeriod($start, $range);
-                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
-            }
-        }

-        if ($moment != 'all' && $loop > 1) {
-            $subTitle = trans(
-                'firefly.journals_in_period_for_tag',
-                ['tag' => $tag->tag, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
-            );
-        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount()
+                  ->setTag($tag)->withBudgetInformation()->withCategoryInformation()->removeFilter(InternalTransferFilter::class);
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath($path);

-        return view('tags.show', compact('apiKey', 'tag', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end', 'moment'));
+        $sums = $repository->sumsOfTag($tag, $start, $end);
+
+        return view('tags.show', compact('apiKey', 'tag', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'start', 'end', 'moment'));
    }

-
    /**
     * @param TagFormRequest $request
     *
@@ -408,4 +348,6 @@ class TagController extends Controller
        return $collection;

    }
+
+
 }
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -85,7 +85,7 @@ class ConvertController extends Controller

        // cannot convert split.
        if ($journal->transactions()->count() > 2) {
-            Session::flash('error', trans('firefly.cannot_convert_split_journl'));
+            Session::flash('error', trans('firefly.cannot_convert_split_journal'));

            return redirect(route('transactions.show', [$journal->id]));
        }
@@ -134,7 +134,7 @@ class ConvertController extends Controller
        }

        if ($journal->transactions()->count() > 2) {
-            Session::flash('error', trans('firefly.cannot_convert_split_journl'));
+            Session::flash('error', trans('firefly.cannot_convert_split_journal'));

            return redirect(route('transactions.show', [$journal->id]));
        }
@@ -185,7 +185,7 @@ class ConvertController extends Controller
            case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL:
            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL:
                // three and five
-                if ($data['destination_account_expense'] === '') {
+                if ($data['destination_account_expense'] === '' || is_null($data['destination_account_expense'])) {
                    // destination is a cash account.
                    $destination = $accountRepository->getCashAccount();

@@ -232,7 +232,7 @@ class ConvertController extends Controller
            case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT:
            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT:

-                if ($data['source_account_revenue'] === '') {
+                if ($data['source_account_revenue'] === '' || is_null($data['source_account_revenue'])) {
                    // destination is a cash account.
                    $destination = $accountRepository->getCashAccount();

--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * LinkController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Transaction;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\JournalLinkRequest;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionJournalLink;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Log;
+use Preferences;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class LinkController
+ *
+ * @package FireflyIII\Http\Controllers\Transaction
+ */
+class LinkController extends Controller
+{
+
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // some useful repositories:
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', trans('firefly.transactions'));
+                View::share('mainTitleIcon', 'fa-repeat');
+
+                return $next($request);
+            }
+        );
+
+    }
+
+
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function delete(TransactionJournalLink $link)
+    {
+        $subTitleIcon = 'fa-link';
+        $subTitle     = trans('breadcrumbs.delete_journal_link');
+        $this->rememberPreviousUri('journal_links.delete.uri');
+
+        return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param LinkTypeRepositoryInterface $repository
+     * @param TransactionJournalLink      $link
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
+    {
+        $repository->destroyLink($link);
+
+        Session::flash('success', strval(trans('firefly.deleted_link')));
+        Preferences::mark();
+
+        return redirect(strval(session('journal_links.delete.uri')));
+    }
+
+    /**
+     * @param JournalLinkRequest          $request
+     * @param LinkTypeRepositoryInterface $repository
+     * @param JournalRepositoryInterface  $journalRepository
+     * @param TransactionJournal          $journal
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function store(
+        JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
+    ) {
+        $linkInfo = $request->getLinkInfo();
+        if ($linkInfo['transaction_journal_id'] === 0) {
+            Session::flash('error', trans('firefly.invalid_link_selection'));
+
+            return redirect(route('transactions.show', [$journal->id]));
+        }
+        $linkType      = $repository->find($linkInfo['link_type_id']);
+        $other         = $journalRepository->find($linkInfo['transaction_journal_id']);
+        $alreadyLinked = $repository->findLink($journal, $other);
+        if ($alreadyLinked) {
+            Session::flash('error', trans('firefly.journals_error_linked'));
+
+            return redirect(route('transactions.show', [$journal->id]));
+        }
+        Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id));
+
+        $journalLink = new TransactionJournalLink;
+        $journalLink->linkType()->associate($linkType);
+        if ($linkInfo['direction'] === 'inward') {
+            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $other->id, $journal->id));
+            $journalLink->source()->associate($other);
+            $journalLink->destination()->associate($journal);
+        }
+
+        if ($linkInfo['direction'] === 'outward') {
+            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->outward, $journal->id, $other->id));
+            $journalLink->source()->associate($journal);
+            $journalLink->destination()->associate($other);
+        }
+
+        $journalLink->comment = $linkInfo['comments'];
+        $journalLink->save();
+        Session::flash('success', trans('firefly.journals_linked'));
+
+        return redirect(route('transactions.show', [$journal->id]));
+    }
+
+    /**
+     * @param LinkTypeRepositoryInterface $repository
+     * @param TransactionJournalLink      $link
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
+    {
+
+        $repository->switchLink($link);
+
+        return redirect(URL::previous());
+    }
+
+}
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -86,7 +86,7 @@ class MassController extends Controller
            foreach ($ids as $journalId) {
                /** @var TransactionJournal $journal */
                $journal = $repository->find(intval($journalId));
-                if (!is_null($journal->id) && $journalId == $journal->id) {
+                if (!is_null($journal->id) && intval($journalId) === $journal->id) {
                    $set->push($journal);
                }
            }
@@ -131,12 +131,11 @@ class MassController extends Controller
        $filtered = new Collection;
        $messages = [];
        /**
-         * @var int                $index
         * @var TransactionJournal $journal
         */
-        foreach ($journals as $index => $journal) {
-            $sources      = $journal->sourceAccountList($journal);
-            $destinations = $journal->destinationAccountList($journal);
+        foreach ($journals as $journal) {
+            $sources      = $journal->sourceAccountList();
+            $destinations = $journal->destinationAccountList();
            if ($sources->count() > 1) {
                $messages[] = trans('firefly.cannot_edit_multiple_source', ['description' => $journal->description, 'id' => $journal->id]);
                continue;
@@ -213,11 +212,11 @@ class MassController extends Controller
                if ($journal) {
                    // get optional fields:
                    $what              = strtolower($journal->transactionTypeStr());
-                    $sourceAccountId   = $request->get('source_account_id')[$journal->id] ??  0;
+                    $sourceAccountId   = $request->get('source_account_id')[$journal->id] ?? 0;
                    $sourceAccountName = $request->get('source_account_name')[$journal->id] ?? '';
-                    $destAccountId     = $request->get('destination_account_id')[$journal->id] ??  0;
+                    $destAccountId     = $request->get('destination_account_id')[$journal->id] ?? 0;
                    $destAccountName   = $request->get('destination_account_name')[$journal->id] ?? '';
-                    $budgetId          = $request->get('budget_id')[$journal->id] ??  0;
+                    $budgetId          = $request->get('budget_id')[$journal->id] ?? 0;
                    $category          = $request->get('category')[$journal->id];
                    $tags              = $journal->tags->pluck('tag')->toArray();
                    $amount            = round($request->get('amount')[$journal->id], 12);
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -14,13 +14,16 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Transaction;


+use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Events\StoredTransactionJournal;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\JournalFormRequest;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
@@ -115,7 +118,7 @@ class SingleController extends Controller
            'foreign_amount'            => $foreignAmount,
            'native_amount'             => $foreignAmount,
            'amount_currency_id_amount' => $transaction->foreign_currency_id ?? 0,
-            'date'                      => $journal->date->format('Y-m-d'),
+            'date'                      => (new Carbon())->format('Y-m-d'),
            'budget_id'                 => $budgetId,
            'category'                  => $categoryName,
            'tags'                      => $tags,
@@ -126,8 +129,15 @@ class SingleController extends Controller
            'payment_date'              => $journal->getMeta('payment_date'),
            'invoice_date'              => $journal->getMeta('invoice_date'),
            'internal_reference'        => $journal->getMeta('internal_reference'),
-            'notes'                     => $journal->getMeta('notes'),
+            'notes'                     => '',
        ];
+
+        /** @var Note $note */
+        $note = $journal->notes()->first();
+        if (!is_null($note)) {
+            $preFilled['notes'] = $note->text;
+        }
+
        Session::flash('preFilled', $preFilled);

        return redirect(route('transactions.create', [strtolower($journal->transactionType->type)]));
@@ -142,7 +152,7 @@ class SingleController extends Controller
    {
        $what           = strtolower($what);
        $uploadSize     = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size')));
-        $assetAccounts  = ExpandedForm::makeSelectList($this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
+        $assetAccounts  = $this->groupedActiveAccountList();
        $budgets        = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
        $piggyBanks     = $this->piggyBanks->getPiggyBanksWithAmount();
        $piggies        = ExpandedForm::makeSelectListWithEmpty($piggyBanks);
@@ -174,7 +184,7 @@ class SingleController extends Controller
     *
     * @param TransactionJournal $journal
     *
-     * @return View
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
     */
    public function delete(TransactionJournal $journal)
    {
@@ -199,10 +209,10 @@ class SingleController extends Controller
    }

    /**
-     * @param JournalRepositoryInterface $repository
-     * @param TransactionJournal         $transactionJournal
+     * @param TransactionJournal $transactionJournal
     *
     * @return \Illuminate\Http\RedirectResponse
+     * @internal param JournalRepositoryInterface $repository
     */
    public function destroy(TransactionJournal $transactionJournal)
    {
@@ -238,7 +248,7 @@ class SingleController extends Controller
        }

        $what          = strtolower($journal->transactionTypeStr());
-        $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
+        $assetAccounts = $this->groupedAccountList();
        $budgetList    = ExpandedForm::makeSelectListWithEmpty($this->budgets->getBudgets());

        // view related code
@@ -268,7 +278,7 @@ class SingleController extends Controller
            'payment_date'             => $journal->dateAsString('payment_date'),
            'invoice_date'             => $journal->dateAsString('invoice_date'),
            'interal_reference'        => $journal->getMeta('internal_reference'),
-            'notes'                    => $journal->getMeta('notes'),
+            'notes'                    => '',

            // amount fields
            'amount'                   => $pTransaction->amount,
@@ -281,6 +291,11 @@ class SingleController extends Controller
            'foreign_currency'         => $foreignCurrency,
            'destination_currency'     => $foreignCurrency,
        ];
+        /** @var Note $note */
+        $note = $journal->notes()->first();
+        if (!is_null($note)) {
+            $preFilled['notes'] = $note->text;
+        }

        // amounts for withdrawals and deposits:
        // amount, native_amount, source_amount, destination_amount
@@ -408,6 +423,46 @@ class SingleController extends Controller
        return redirect($this->getPreviousUri('transactions.edit.uri'));
    }

+    /**
+     * @return array
+     */
+    private function groupedAccountList(): array
+    {
+        $accounts = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $return   = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $type = $account->getMeta('accountRole');
+            if (strlen($type) === 0) {
+                $type = 'no_account_type';
+            }
+            $key                        = strval(trans('firefly.opt_group_' . $type));
+            $return[$key][$account->id] = $account->name;
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return array
+     */
+    private function groupedActiveAccountList(): array
+    {
+        $accounts = $this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $return   = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $type = $account->getMeta('accountRole');
+            if (strlen($type) === 0) {
+                $type = 'no_account_type';
+            }
+            $key                        = strval(trans('firefly.opt_group_' . $type));
+            $return[$key][$account->id] = $account->name;
+        }
+
+        return $return;
+    }
+
    /**
     * @param TransactionJournal $journal
     *
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -18,6 +18,8 @@ use ExpandedForm;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\SplitJournalFormRequest;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -94,13 +96,23 @@ class SplitController extends Controller

        $uploadSize     = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size')));
        $currencies     = $this->currencies->get();
-        $assetAccounts  = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
+        $accountList    = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $assetAccounts  = ExpandedForm::makeSelectList($accountList);
        $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
        $budgets        = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
        $preFilled      = $this->arrayFromJournal($request, $journal);
        $subTitle       = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
        $subTitleIcon   = 'fa-pencil';

+        $accountArray = [];
+        // account array to display currency info:
+        /** @var Account $account */
+        foreach ($accountList as $account) {
+            $accountArray[$account->id]                = $account;
+            $accountArray[$account->id]['currency_id'] = intval($account->getMeta('currency_id'));
+        }
+
+
        Session::flash('gaEventCategory', 'transactions');
        Session::flash('gaEventAction', 'edit-split-' . $preFilled['what']);

@@ -114,26 +126,25 @@ class SplitController extends Controller
            'transactions.split.edit',
            compact(
                'subTitleIcon', 'currencies', 'optionalFields',
-                'preFilled', 'subTitle', 'amount', 'sourceAccounts', 'uploadSize', 'destinationAccounts', 'assetAccounts',
-                'budgets', 'journal'
+                'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
+                'budgets', 'journal', 'accountArray', 'previous'
            )
        );
    }


    /**
-     * @param Request                    $request
+     * @param SplitJournalFormRequest    $request
     * @param JournalRepositoryInterface $repository
     * @param TransactionJournal         $journal
     *
     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
-    public function update(Request $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
+    public function update(SplitJournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
    {
        if ($this->isOpeningBalance($journal)) {
            return $this->redirectToAccount($journal);
        }
-
        $data    = $this->arrayFromInput($request);
        $journal = $repository->updateSplitJournal($journal, $data);
        /** @var array $files */
@@ -167,12 +178,13 @@ class SplitController extends Controller
    }

    /**
-     * @param Request $request
+     * @param SplitJournalFormRequest $request
     *
     * @return array
     */
-    private function arrayFromInput(Request $request): array
+    private function arrayFromInput(SplitJournalFormRequest $request): array
    {
+        $tags  = is_null($request->get('tags')) ? '' : $request->get('tags');
        $array = [
            'journal_description'            => $request->get('journal_description'),
            'journal_source_account_id'      => $request->get('journal_source_account_id'),
@@ -189,7 +201,7 @@ class SplitController extends Controller
            'invoice_date'                   => $request->get('invoice_date'),
            'internal_reference'             => $request->get('internal_reference'),
            'notes'                          => $request->get('notes'),
-            'tags'                           => explode(',', $request->get('tags')),
+            'tags'                           => explode(',', $tags),

            // transactions.
            'transactions'                   => $this->getTransactionDataFromRequest($request),
@@ -200,8 +212,8 @@ class SplitController extends Controller
    }

    /**
-     * @param Request            $request
-     * @param TransactionJournal $journal
+     * @param SplitJournalFormRequest|Request $request
+     * @param TransactionJournal              $journal
     *
     * @return array
     */
@@ -234,6 +246,8 @@ class SplitController extends Controller
            // transactions.
            'transactions'                   => $this->getTransactionDataFromJournal($journal),
        ];
+        // update transactions array with old request data.
+        $array['transactions'] = $this->updateWithPrevious($array['transactions'], $request->old());

        return $array;
    }
@@ -282,11 +296,11 @@ class SplitController extends Controller
    }

    /**
-     * @param Request $request
+     * @param SplitJournalFormRequest|Request $request
     *
     * @return array
     */
-    private function getTransactionDataFromRequest(Request $request): array
+    private function getTransactionDataFromRequest(SplitJournalFormRequest $request): array
    {
        $return       = [];
        $transactions = $request->get('transactions');
@@ -312,5 +326,36 @@ class SplitController extends Controller
        return $return;
    }

+    /**
+     * @param $array
+     * @param $old
+     *
+     * @return array
+     */
+    private function updateWithPrevious($array, $old): array
+    {
+        if (count($old) === 0 || !isset($old['transactions'])) {
+            return $array;
+        }
+        $old = $old['transactions'];
+        foreach ($old as $index => $row) {
+            if (isset($array[$index])) {
+                $array[$index] = array_merge($array[$index], $row);
+                continue;
+            }
+            // take some info from first transaction, that should at least exist.
+            $array[$index]                                = $row;
+            $array[$index]['transaction_currency_id']     = $array[0]['transaction_currency_id'];
+            $array[$index]['transaction_currency_code']   = $array[0]['transaction_currency_code'];
+            $array[$index]['transaction_currency_symbol'] = $array[0]['transaction_currency_symbol'];
+            $array[$index]['foreign_amount']              = round($array[0]['foreign_destination_amount'] ?? '0', 12);
+            $array[$index]['foreign_currency_id']         = $array[0]['foreign_currency_id'];
+            $array[$index]['foreign_currency_code']       = $array[0]['foreign_currency_code'];
+            $array[$index]['foreign_currency_symbol']     = $array[0]['foreign_currency_symbol'];
+        }
+
+        return $array;
+    }
+

 }
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -17,9 +17,11 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalTaskerInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -27,7 +29,6 @@ use Log;
 use Navigation;
 use Preferences;
 use Response;
-use Steam;
 use View;

 /**
@@ -70,15 +71,13 @@ class TransactionController extends Controller
        // default values:
        $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what);
        $types        = config('firefly.transactionTypesByWhat.' . $what);
-        $page         = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $page         = intval($request->get('page'));
        $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
-        $count        = 0;
-        $loop         = 0;
        $range        = Preferences::get('viewRange', '1M')->data;
        $start        = null;
        $end          = null;
        $periods      = new Collection;
-        $path         = '/transactions/' . $what;
+        $path         = route('transactions.index', [$what]);

        // prep for "all" view.
        if ($moment === 'all') {
@@ -86,13 +85,14 @@ class TransactionController extends Controller
            $first    = $repository->first();
            $start    = $first->date ?? new Carbon;
            $end      = new Carbon;
-            $path     = '/transactions/' . $what . '/all/';
+            $path     = route('transactions.index', [$what, 'all']);
        }

        // prep for "specific date" view.
        if (strlen($moment) > 0 && $moment !== 'all') {
            $start    = new Carbon($moment);
            $end      = Navigation::endOfPeriod($start, $range);
+            $path     = route('transactions.index', [$what, $moment]);
            $subTitle = trans(
                'firefly.title_' . $what . '_between',
                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
@@ -110,32 +110,14 @@ class TransactionController extends Controller
                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
            );
        }
-        // grab journals, but be prepared to jump a period back to get the right ones:
-        Log::info('Now at transaction loop start.');
-        while ($count === 0 && $loop < 3) {
-            $loop++;
-            Log::info('Count is zero, search for journals.');
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class);
-            $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes($types)->setLimit($pageSize)->setPage($page)->withOpposingAccount();
-            $collector->removeFilter(InternalTransferFilter::class);
-            $journals = $collector->getPaginatedJournals();
-            $journals->setPath($path);
-            $count = $journals->getCollection()->count();
-            if ($count === 0 && $loop < 3) {
-                $start->subDay();
-                $start = Navigation::startOfPeriod($start, $range);
-                $end   = Navigation::endOfPeriod($start, $range);
-                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
-            }
-        }

-        if ($moment != 'all' && $loop > 1) {
-            $subTitle = trans(
-                'firefly.title_' . $what . '_between',
-                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
-            );
-        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes($types)->setLimit($pageSize)->setPage($page)->withOpposingAccount();
+        $collector->removeFilter(InternalTransferFilter::class);
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath($path);
+

        return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'periods', 'start', 'end', 'moment'));

@@ -169,23 +151,26 @@ class TransactionController extends Controller
    }

    /**
-     * @param TransactionJournal     $journal
-     * @param JournalTaskerInterface $tasker
+     * @param TransactionJournal          $journal
+     * @param JournalTaskerInterface      $tasker
     *
-     * @return View
+     * @param LinkTypeRepositoryInterface $linkTypeRepository
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
     */
-    public function show(TransactionJournal $journal, JournalTaskerInterface $tasker)
+    public function show(TransactionJournal $journal, JournalTaskerInterface $tasker, LinkTypeRepositoryInterface $linkTypeRepository)
    {
        if ($this->isOpeningBalance($journal)) {
            return $this->redirectToAccount($journal);
        }
-
+        $linkTypes    = $linkTypeRepository->get();
+        $links        = $linkTypeRepository->getLinks($journal);
        $events       = $tasker->getPiggyBankEvents($journal);
        $transactions = $tasker->getTransactionsOverview($journal);
        $what         = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
        $subTitle     = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';

-        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions'));
+        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes', 'links'));


    }
@@ -203,7 +188,7 @@ class TransactionController extends Controller
        $start      = $first->date ?? new Carbon;
        $range      = Preferences::get('viewRange', '1M')->data;
        $start      = Navigation::startOfPeriod($start, $range);
-        $end        = Navigation::endOfX(new Carbon, $range);
+        $end        = Navigation::endOfX(new Carbon, $range, null);
        $entries    = new Collection;
        $types      = config('firefly.transactionTypesByWhat.' . $what);

@@ -229,35 +214,24 @@ class TransactionController extends Controller
            $collector = app(JournalCollectorInterface::class);
            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withOpposingAccount()->setTypes($types);
            $collector->removeFilter(InternalTransferFilter::class);
-            $set      = $collector->getJournals();
-            $sum      = $set->sum('transaction_amount');
-            $journals = $set->count();
+            $journals = $collector->getJournals();
+            $sum      = $journals->sum('transaction_amount');
+
+            // count per currency:
+            $sums     = $this->sumPerCurrency($journals);
            $dateStr  = $end->format('Y-m-d');
            $dateName = Navigation::periodShow($end, $range);
            $array    = [
-                'string'      => $dateStr,
-                'name'        => $dateName,
-                'count'       => $journals,
-                'spent'       => 0,
-                'earned'      => 0,
-                'transferred' => 0,
-                'date'        => clone $end,
+                'string' => $dateStr,
+                'name'   => $dateName,
+                'sum'    => $sum,
+                'sums'   => $sums,
+                'date'   => clone $end,
            ];
            Log::debug(sprintf('What is %s', $what));
-            switch ($what) {
-                case 'withdrawal':
-                    $array['spent'] = $sum;
-                    break;
-                case 'deposit':
-                    $array['earned'] = $sum;
-                    break;
-                case 'transfers':
-                case 'transfer':
-                    $array['transferred'] = Steam::positive($sum);
-                    break;
-
+            if ($journals->count() > 0) {
+                $entries->push($array);
            }
-            $entries->push($array);
            $end = Navigation::subtractPeriod($end, $range, 1);
        }
        Log::debug('End of loop');
@@ -266,4 +240,41 @@ class TransactionController extends Controller
        return $entries;
    }

+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function sumPerCurrency(Collection $collection): array
+    {
+        $return = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $currencyId = $transaction->transaction_currency_id;
+
+            // save currency information:
+            if (!isset($return[$currencyId])) {
+                $currencySymbol      = $transaction->transaction_currency_symbol;
+                $decimalPlaces       = $transaction->transaction_currency_dp;
+                $currencyCode        = $transaction->transaction_currency_code;
+                $return[$currencyId] = [
+                    'currency' => [
+                        'id'     => $currencyId,
+                        'code'   => $currencyCode,
+                        'symbol' => $currencySymbol,
+                        'dp'     => $decimalPlaces,
+                    ],
+                    'sum'      => '0',
+                    'count'    => 0,
+                ];
+            }
+            // save amount:
+            $return[$currencyId]['sum'] = bcadd($return[$currencyId]['sum'], $transaction->transaction_amount);
+            $return[$currencyId]['count']++;
+        }
+        asort($return);
+
+        return $return;
+    }
+
 }
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -1,14 +1,15 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * Kernel.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */
-declare(strict_types=1);

 namespace FireflyIII\Http;

@@ -21,42 +22,24 @@ use FireflyIII\Http\Middleware\Range;
 use FireflyIII\Http\Middleware\RedirectIfAuthenticated;
 use FireflyIII\Http\Middleware\RedirectIfTwoFactorAuthenticated;
 use FireflyIII\Http\Middleware\Sandstorm;
-use FireflyIII\Http\Middleware\StartFireflySession;
+use FireflyIII\Http\Middleware\TrimStrings;
+use FireflyIII\Http\Middleware\TrustProxies;
 use FireflyIII\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
+use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
 use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\Routing\Middleware\ThrottleRequests;
+use Illuminate\Session\Middleware\StartSession;
 use Illuminate\View\Middleware\ShareErrorsFromSession;

-/**
- * Class Kernel
- *
- * @package FireflyIII\Http
- */
+
 class Kernel extends HttpKernel
 {
-
-    /**
-     * The bootstrap classes for the application.
-     *
-     * Next upgrade verify these are the same.
-     *
-     * @var array
-     */
-    protected $bootstrappers
-        = [
-            'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables',
-            'Illuminate\Foundation\Bootstrap\LoadConfiguration',
-            'Illuminate\Foundation\Bootstrap\HandleExceptions',
-            'Illuminate\Foundation\Bootstrap\RegisterFacades',
-            'Illuminate\Foundation\Bootstrap\RegisterProviders',
-            'Illuminate\Foundation\Bootstrap\BootProviders',
-        ];
-
    /**
     * The application's global HTTP middleware stack.
     *
@@ -67,6 +50,10 @@ class Kernel extends HttpKernel
    protected $middleware
        = [
            CheckForMaintenanceMode::class,
+            ValidatePostSize::class,
+            TrimStrings::class,
+            ConvertEmptyStringsToNull::class,
+            TrustProxies::class,
        ];

    /**
@@ -83,7 +70,7 @@ class Kernel extends HttpKernel
                Sandstorm::class,
                EncryptCookies::class,
                AddQueuedCookiesToResponse::class,
-                StartFireflySession::class,
+                StartSession::class,
                ShareErrorsFromSession::class,
                VerifyCsrfToken::class,
                SubstituteBindings::class,
@@ -95,7 +82,7 @@ class Kernel extends HttpKernel
                Sandstorm::class,
                EncryptCookies::class,
                AddQueuedCookiesToResponse::class,
-                StartFireflySession::class,
+                StartSession::class,
                ShareErrorsFromSession::class,
                VerifyCsrfToken::class,
                SubstituteBindings::class,
@@ -108,7 +95,7 @@ class Kernel extends HttpKernel
                Sandstorm::class,
                EncryptCookies::class,
                AddQueuedCookiesToResponse::class,
-                StartFireflySession::class,
+                StartSession::class,
                ShareErrorsFromSession::class,
                VerifyCsrfToken::class,
                SubstituteBindings::class,
@@ -123,7 +110,7 @@ class Kernel extends HttpKernel
                Sandstorm::class,
                EncryptCookies::class,
                AddQueuedCookiesToResponse::class,
-                StartFireflySession::class,
+                StartSession::class,
                ShareErrorsFromSession::class,
                VerifyCsrfToken::class,
                SubstituteBindings::class,
@@ -138,7 +125,7 @@ class Kernel extends HttpKernel
                Sandstorm::class,
                EncryptCookies::class,
                AddQueuedCookiesToResponse::class,
-                StartFireflySession::class,
+                StartSession::class,
                ShareErrorsFromSession::class,
                VerifyCsrfToken::class,
                SubstituteBindings::class,
@@ -156,7 +143,7 @@ class Kernel extends HttpKernel
                Sandstorm::class,
                EncryptCookies::class,
                AddQueuedCookiesToResponse::class,
-                StartFireflySession::class,
+                StartSession::class,
                ShareErrorsFromSession::class,
                VerifyCsrfToken::class,
                SubstituteBindings::class,
@@ -174,6 +161,7 @@ class Kernel extends HttpKernel
            ],
        ];

+
    /**
     * The application's route middleware.
     *
@@ -189,6 +177,5 @@ class Kernel extends HttpKernel
            'can'        => Authorize::class,
            'guest'      => RedirectIfAuthenticated::class,
            'throttle'   => ThrottleRequests::class,
-            'range'      => Range::class,
        ];
 }
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -44,8 +44,13 @@ class Authenticate
            return redirect()->guest('login');
        }
        if (intval(auth()->user()->blocked) === 1) {
+            $message = strval(trans('firefly.block_account_logout'));
+            if (auth()->user()->blocked_code === 'email_changed') {
+                $message = strval(trans('firefly.email_changed_logout'));
+            }
+
+            Session::flash('logoutMessage', $message);
            Auth::guard($guard)->logout();
-            Session::flash('logoutMessage', trans('firefly.block_account_logout'));

            return redirect()->guest('login');
        }
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -1,25 +1,21 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * EncryptCookies.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */
-declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
+use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;

-/**
- * Class EncryptCookies
- *
- * @package FireflyIII\Http\Middleware
- */
-class EncryptCookies extends BaseEncrypter
+class EncryptCookies extends Middleware
 {
    /**
     * The names of the cookies that should not be encrypted.
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -13,7 +13,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Amount;
 use App;
 use Carbon\Carbon;
 use Closure;
@@ -98,13 +97,18 @@ class Range
        $locale = array_map('trim', $locale);

        setlocale(LC_TIME, $locale);
-        setlocale(LC_MONETARY, $locale);
+        $moneyResult = setlocale(LC_MONETARY, $locale);
+
+        // send error to view if could not set money format
+        if ($moneyResult === false) {
+            View::share('invalidMonetaryLocale', true);
+        }


        // save some formats:
        $monthAndDayFormat = (string)trans('config.month_and_day');
        $dateTimeFormat    = (string)trans('config.date_time');
-        $defaultCurrency   = Amount::getDefaultCurrency();
+        $defaultCurrency   = app('amount')->getDefaultCurrency();

        View::share('monthAndDayFormat', $monthAndDayFormat);
        View::share('dateTimeFormat', $dateTimeFormat);
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -1,25 +1,21 @@
 <?php
+declare(strict_types=1);
+
+
 /**
 * RedirectIfAuthenticated.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
 * This software may be modified and distributed under the terms of the
 * Creative Commons Attribution-ShareAlike 4.0 International License.
 *
 * See the LICENSE file for details.
 */
-declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

 use Closure;
 use Illuminate\Support\Facades\Auth;

-/**
- * Class RedirectIfAuthenticated
- *
- * @package FireflyIII\Http\Middleware
- */
 class RedirectIfAuthenticated
 {
    /**
@@ -34,7 +30,7 @@ class RedirectIfAuthenticated
    public function handle($request, Closure $next, $guard = null)
    {
        if (Auth::guard($guard)->check()) {
-            return redirect('/');
+            return redirect('/home');
        }

        return $next($request);
--- a/app/Http/Middleware/StartFireflySession.php
+++ b/app/Http/Middleware/StartFireflySession.php
@@ -1,54 +0,0 @@
-<?php
-/**
- * StartFireflySession.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Http\Middleware;
-
-use Illuminate\Http\Request;
-use Illuminate\Session\Middleware\StartSession;
-use Illuminate\Session\SessionManager;
-
-/**
- * Class StartFireflySession
- *
- * @package FireflyIII\Http\Middleware
- */
-class StartFireflySession extends StartSession
-{
-
-    /**
-     * Create a new session middleware.
-     *
-     * @param  \Illuminate\Session\SessionManager $manager
-     */
-    public function __construct(SessionManager $manager)
-    {
-        parent::__construct($manager);
-    }
-
-    /**
-     * Store the current URL for the request if necessary.
-     *
-     * @param  \Illuminate\Http\Request              $request
-     * @param  \Illuminate\Contracts\Session\Session $session
-     *
-     * @return void
-     */
-    protected function storeCurrentUrl(Request $request, $session)
-    {
-        $fullUrl = $request->fullUrl();
-        if ($request->method() === 'GET' && $request->route() && !$request->ajax()) {
-            if (strpos($fullUrl, '/javascript/') === false) {
-                $session->setPreviousUrl($fullUrl);
-            }
-        }
-    }
-
-}
--- a/Show More
+++ b/Show More