Getting close to functional

Need to add the various template files into the git repo, as they have
been modified