Changed some of my todos