Changed templating based on thajos example