agreed! The TODOs that were in this pull request should be all gone now with the last commit.