S3 support added. Must commit and test on Heroku