Closes #20; Simpler template binding