There are a few TODOs sprinkled in this PR. It would be a good idea to make sure they have GH issues so they are not forgotten.