much refactoring, moving to s3
ready for beta