Current account service is now accessible via CurrentAccount facade. This has helped clean up quite a bit of code.