Temp rewrite for aws test

Need to try some things in aws.