second-thinking some of these TODOs