Just Templates now for master branch