Finished. Pop-up uses server filenames.
Issue #40