Removed TODO points.. Need new ones?