See TODO messages for what to focus on next.