First draft on AWS integration