Template integration

@smusula check this out