First pass of adding custom content