Updated Files to include validation part 1