Add back challenge and submission id to files.  this makes me sad