Submission overhaul underway; currently hangs on commit