Now all exactly the same except contents. Ready to change into templates.