SB-75 Re-work the ArtifactResolutionService

Committing work-in-progress.