Progress on Submission System
Added some new conditionals