final commit, still problems with image upload, more will happen tomorrow