Worked some with templates. New DB-dump.