Work continues with AWS stuff