Changed template.find to evt.target.
merge
WIP