template and faces added.
merge conflicts resolved.