* lot of work on the aws stuff