Update main template. Get working for s3 creation
Add in some clever make helpers