Feature/content extension

@andygrunwald 

This is the refreshed pull request for the content extension. Please review.