Yes, I am working on that TODO. I would appreciate comments for the rest of the PR.