Work on breaking the Content functionality out into a module