Catching up templates and adding a few new fields, migrate!