Refactor! Dust templates, better organization.