I'd rather not (if at all possible) dig further into the AWS-only hole for IaaS, so depending on Athena (which is cool) is not ideal