Final changes, eveything's working (except BankService)!
Revert "Final changes, eveything's working (except BankService)!"

This reverts commit 22e3d7988b156dc146e3e4cc22918fac43cf99e8.
Revert "Revert "Final changes, eveything's working (except BankService)!""

This reverts commit 3bd3578d85e204fa63dad42f7b78b097178403b8.
Adding TODO message.
Resolved conflicts