First pass through new content

Finally made it through :+1: