Added submission code, need to test