refactor ec2. need to test vagrant still