Precise Templates

Fixes #1, #3