This and the next three can stay as TODOs or as new github issues.  It just needs to be tracked somewhere.