More migration and templating work.