Return validation and filtering to save 

MAKE TESTS PASS