Overhaul of several methods, add image uploading
Fix image upload queueing