adding templates lots of test to be done