Are we ok w/ this being an active TODO? (eg should this be addressed now or in the future)