Worked some more on artifact and media management

Not quite functional yet