There are ~7-8 todo statements in the codebase, most of which don't have associated issues. We should create issues for them and address them when we get the chance.