Added ability to save rather than immediately submit