want to keep template name,

more work done, still not complete.