Lots more changes - Get imagepicker working.