work completed this week - template builds not working fresh builds almost working