Work on blank submission handling (still dysfunctional at this point, but getting there)