Merge branch 'master' into eduard-final-1
Test Case: New Surfer

Had to account for new validation.
Merge branch 'eduard-final-1'