Begin refactoring process, messy template usage
16 files changed