Added templates, peddlr and static