Move code into more appropriate jsp, manage submission when embargo feature is off