Some work on images, uploading has to be taken care of now