pushing my templating work