Making the templates work ... again.
Starting to figure out the adding functionality. Still doesn't work, though.