Should this be on `SubmissionManager` instead?