Now with template! Cleanup on Codebase.