The basics for templates
bringing in sync with master