Adding TODO's that are currently critial to function testing.