Added some todos for the next time.