working
moved tests
back to square one
a point in time
working
code review one
Merge branch 'develop' into uploader-2
code review changes
Merge pull request #1235 from john-hill/uploader-2

Uploader 2