Merge pull request #90 from mikewalch/export-rewrite

Export queue rewrite and refactored code to use 'uri'