Thank you for the response.
Having crammed for the other parts of the project, I didn't manage to implement any viewport handling pre-submission.