Started working on ImagePicker, preparing to merge with master