Failed template refactor

This isn't working for some unknown reasons. I'm aborting this refactor
for the old way that I was doing it that worked better.
Fixes to this refactor

This makes the weather template structure work properly. Previously I
was not seperating the collection from the template data.