Continue work on Submissions Context