Image capture works now
Cleaned up multiple file uploads
Resolved conflicts