Various changes. Commiting so can branch to bring the template in.