first effort at checking that submissions are valid
Quick fix by adding return value to function signature
Merge branch 'fix_parsing'