baseline complete
added templates