added some ec2 stuff
added ec2 functionality, not quite finished yet, but had to leave for the day