A lot of work on the AWS integration