Template was merged. Will continue on a new branch with some linting fixes up next