Continuing work on Foundation templating