There's definitely a lot more refactoring, fragmenting etc that can be done around these templates but we've run out of time for now.