Added todos for Finn