Better templating of stuff