Added some todos in comments