Getting ready for ec2 stuff