Pat ec2

@kbenne would you mind reviewing this work? Also, I gave you the Pivotal ticket to approve. Thanks! Evan