Step 2 templates

Needs changes in index.php before these are considered usable.