Further dynamascised template, fixes #2