more AWS work in progress