Just wondering why these are being left as TODOs for now. Don't want to make the pull request even bigger?