It might be nice to put this in the backlog instead of a TODO.