Added some todos :)