- Having the ArtifactGatherer know about about the tcp upload pad seems like a
  layer violation. Is there someplace else to put it?
- Clean up the factoring mess.
