Added some todos..