Added TODO's=> committing to branch into Validation implementation