Reworking submission logic further, allowing save on submit of form