@temas please review these TODO temas's