Some more tweaks, start thinking about templates