Adding TODO for foundry
Taking notes of performance items