Completes validation per the story requirements

Cool :+1: