added todo cause thats how I roll.