Added some todos for next release