Fleshing out the outline, removing "content" and "navigation" for now.