Move many things into their own template files - not done!