templates almost finished

check point commit