Implemented some (not all) of the aws options