More head tweaking. Need a templating solution