Starting to add attach picture support