Matches implementation pt. 6

Validation implemented.