Content delivery

@gabrielhase Have a look at this if you haven't seen it yet.