Making this todo more clear