Add templates, wall output, etc