Got s3 working and other stuff