Added templates, node innards, etc