Begin refactoring process, messy template usage