s3 works
working on event pics
merge branches