Lots of changes
Merge pull request #1 from bmneely/uploading-images

Lots of changes