Yes and yes, but I think this can be work yet to do.  Let's remove the "TODO" leave the comments and perhaps create some issues in the github tracker.