I believe that's what they want, but to my knowledge, even that part will be being delayed now.

A little late for me as I already doesn't half my week transitioning to wallet-to-wallet accounting...