- Fix template imports
- Consolidate templates, import when needed - Experiment with dynamic collections