Work on separating content functionality out into single module