Stage6

Merges templates for stage six into the master