I will delete the todos; after this PR is merged I will open issues for them.