Added basic wrap, templates