You can work on it on your own, don't wait for my PR. I would like to help but I don't have enough free time to do this right now..
I am going to try to not use _routing for the time being.