More updates

Still work in progress, but some more template files created.