further image upload work
Merge with christian. idk it wont let me commit without a message