First major pass - most templates started