Weekend changes. Debugging double template inclusion.